Merge remote-tracking branch 'origin/Player'

Conflicts:
	unity/Assets/Scripts/PlayerScript/PlayerLogic.cs
Merge branch 'master' of https://github.com/EPROCSEWS2014/drunken-nemesis

Conflicts:
	unity/Assets/Scripts/PlayerScript/PlayerLogic.cs