fixing scene issues in unity
Merge branch 'Feature-Parallax'

Conflicts:
	UnityProject/Assets/Scene.unity
	UnityProject/Library/CurrentLayout.dwlt
	UnityProject/Library/assetDatabase3
	UnityProject/Library/guidmapper
revert to git reset c54aad38996
final revert. again: fuck unity's git support
manually reconfiguring project