update
Merge remote-tracking branch 'origin/master'

Conflicts:
	android/assets/map_resources/levels/test_track.xml
	android/assets/objects/beamOfLove/brickWall.png
	android/assets/objects/signExit/signExit.xml
	core/src/com/mygdx/game/MyGdxGame.java
	core/src/com/mygdx/game/asm/State.java
	core/src/com/mygdx/game/asm/StateManager.java
	core/src/com/mygdx/game/asm/player_asm/BaseState.java
	core/src/com/mygdx/game/asm/player_asm/WalkPhysics.java
	core/src/com/mygdx/game/controller/KeyListener.java
	core/src/com/mygdx/game/controller/PlayerMovementController.java
	core/src/com/mygdx/game/controller/StateManagerController.java
	core/src/com/mygdx/game/model/game_objs/BaseEntity.java
	core/src/com/mygdx/game/view/IngameGUIView.java
	core/src/modules/filesys/FilesysParser.java