update
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/com/beyond_101_game/entity/Player.java
	core/src/com/beyond_101_game/graphics/GameScreen.java