[FIX] some Oculus 3D env fixes
Merge branch 'master' of https://github.com/burstrom/desktopulus

Conflicts:
	Unity/unity-demo/Assets/LM-demoscene.unity
	Unity/unity-demo/Library/CurrentLayout.dwlt
	Unity/unity-demo/Library/assetDatabase3