merging and discarding refactor
Merge branch 'dev' of https://github.com/jpgg/Space-Dinosaurs into dev

Conflicts:
	FowlPlay/Assembly-CSharp.pidb
	FowlPlay/Assets/Scenes/NoahsPrototype.unity
	FowlPlay/Assets/Scripts/AutoMove.cs
	FowlPlay/Assets/Scripts/CharacterManager.cs
	FowlPlay/FowlPlay.userprefs