Import 2f2c1e4384: Merge remote-tracking branch 'origin/master' (by Maki)

This is an automated proposal to look at a commit made by Maki and import it into Overte

Commit:	2f2c1e438466e79eb09408dafa227e762cbc0cce
Author:	Maki
Date:	Sun, 09 Feb 2020 20:32

Merge remote-tracking branch 'origin/master'

Stats:

Filename	Stats	Lines	Added	Removed	Lines in blame
interface/resources/controllers/oculus_touch.json		8	4	4	⚠ 0
interface/resources/controllers/standard.json		40	26	14	⚠ 0
interface/resources/controllers/vive.json		10	10	0	⚠ 0
interface/src/Application.cpp		12	6	6	⚠ 0
libraries/entities-renderer/src/EntityTreeRenderer.cpp		348	213	135	⚠ 0
libraries/entities-renderer/src/RenderableEntityItem.h		1	1	0	⚠ 0
libraries/entities/src/EntityTree.cpp		15	14	1	⚠ 0
libraries/workload/src/workload/ViewTask.h		14	9	5	⚠ 0
scripts/system/controllers/controllerModules/nearGrabEntity.js		482	276	206	⚠ 0
scripts/system/controllers/controllerModules/scaleEntity.js		258	162	96	⚠ 0
scripts/system/controllers/controllerScripts.js		1	1	0	⚠ 0
scripts/system/create/edit.js		2	1	1	⚠ 0
12 files	-	1191	723	468	0

To work on this, please assign the issue to yourself, then look at the commit and decide whether this would be a good addition to Overte.

If the commit is useful, tag it with "Tivoli: Keep", and keep it open until it's merged.
If the commit is not useful, tag it with "Tivoli: Discard", and close it.
If the commit is not useful right now, but might be later, tag it with "Tivoli: Maybe later", and close it.
If it's hard to decide, tag it with "Tivoli: Discuss", and keep it open.

Useful commits should be submitted as a PR against Overte. Tag this issue in PR, so that it's automatically closed once the PR is merged.

You can cherry-pick this issue with this command:

git cherry-pick 2f2c1e438466e79eb09408dafa227e762cbc0cce

overte-org / tivolicloud