Changed object rotation code

-PlayerObject rotates but the collider child does not
Merge remote-tracking branch 'origin/master'

Conflicts:
	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/expandedItems
	Library/guidmapper