correted the player box
Merge branch 'master' of https://github.com/GlobalGameJamTeam/GlobalGameJam2014

Conflicts:
	Assets/GlobalGameJam.unity.meta
	ProjectSettings/EditorBuildSettings.asset