Control fixes
Merge branch 'master' of https://github.com/vorrin/bondage-ballerinas

Conflicts:
	Assets/Prefabs/Background.prefab
	Assets/Prefabs/GUIPlayerInfo.prefab
	Assets/Prefabs/GameController.prefab
	Assets/Prefabs/Player.prefab
	Assets/Prefabs/Ship3d.prefab
	Assets/Scenes/GameScene.unity
	Assets/Sprites/BackgroundSprites.prefab
	Assets/Sprites/BackgroundStuff/BackgroundSprites Data/BackgroundSprites.prefab
	Assets/Sprites/PillowPlayerAnimation.prefab
	Assets/Sprites/PillowPlayerCollection.prefab
	Assets/Sprites/Player/Hat Data/Hat.prefab
	Assets/Sprites/Player/Hat.prefab
	Assets/Sprites/Player/PlayerIdle Data/PlayerIdle.prefab
	Assets/Sprites/Player/PlayerIdle.prefab
	Assets/Sprites/Player/PlayerJumpSprites Data/PlayerJumpSprites.prefab
	Assets/Sprites/Player/PlayerJumpSprites.prefab
	Assets/Sprites/Player/PlayerMove.prefab
	Assets/Sprites/Player/PlayerMoveSprites Data/PlayerMoveSprites.prefab
	Assets/Sprites/Player/PlayerMoveSprites.prefab
	Assets/Sprites/Player/PlayerSprites.prefab
	Assets/Sprites/RainSprites.prefab
	Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/UIDemoSpriteCollection.prefab
	Assets/TK2DROOT/tk2d_demo/demospritecollection/DemoSpriteCollection.prefab
	Assets/TK2DROOT/tk2d_demo/multiatlas/DemoMultiAtlas.prefab
	Assets/TK2DROOT/tk2d_demo/spider/DemoSpiderSpriteCollection.prefab