Merge branch 'master' of https://github.com/DarkOmega/VRJam2014

Conflicts:
	VRJam2014/ProjectSettings/AudioManager.asset
	VRJam2014/ProjectSettings/DynamicsManager.asset
	VRJam2014/ProjectSettings/EditorBuildSettings.asset
	VRJam2014/ProjectSettings/EditorSettings.asset
	VRJam2014/ProjectSettings/GraphicsSettings.asset
	VRJam2014/ProjectSettings/InputManager.asset
	VRJam2014/ProjectSettings/NavMeshLayers.asset
	VRJam2014/ProjectSettings/NetworkManager.asset
	VRJam2014/ProjectSettings/Physics2DSettings.asset
	VRJam2014/ProjectSettings/ProjectSettings.asset
	VRJam2014/ProjectSettings/QualitySettings.asset
	VRJam2014/ProjectSettings/TagManager.asset
	VRJam2014/ProjectSettings/TimeManager.asset