Merge branch 'master' into robert
Organize the files.
Clean up the scene.
Update for 2D.
Add cancelation torque.
Merge branch 'robert'

Conflicts:
	Assets/scenes/MainScene.unity
	ProjectSettings/EditorBuildSettings.asset