Fixes some screwups.
Merge branch 'origin/master'

Conflicts:
	Assets/Prefabs/CustomCat.prefab
	Assets/Scenes/Game.unity
	Build/Build.unity3d
	Game-csharp.v11.suo
	ProjectSettings/TagManager.asset