Gameplay updates
Merge branch 'master' of https://github.com/coastwise/ggj2014

Conflicts:
	Assets/StageSelect/StageSelect.cs
	Assets/Start Screen/start-screen.unity
	ProjectSettings/EditorBuildSettings.asset
Updates prior to Bento Miso