fixed bug
Merge remote-tracking branch 'origin/Development' into Development

Conflicts:
	js/entities/Player.js