Sopme Updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/entities/Player.class
	bin/scenes/SceneMap.class