Modifs prefabs players
Merge branch 'master' of https://github.com/Waidd/GGJ2014

Conflicts:
	Assets/Sample Assets/2D/Scripts/Platformer2DUserControl.cs