Removed stateMachine
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Prefabs/Player.prefab
	Assets/Scenes/Dev.unity
	Game2-csharp.v12.suo
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/82/82cd656fb78d35f4ab1ecb5f38d54a7e