asset directory cleaned, project refactored
Merge branch 'master' of github.com:Franjoo/Game

Conflicts:
	GameDemo-android/assets/data/spine/animations/Max_idle.json
	GameDemo-android/assets/data/spine/animations/Max_idle.png
	GameDemo-android/assets/data/spine/animations/Max_idle.skel
	GameDemo-android/assets/data/spine/animations/Max_move.atlas
	GameDemo-android/assets/data/spine/animations/Max_move.json
	GameDemo-android/assets/data/spine/animations/Max_move.skel
	GameDemo/src/com/angrynerds/gameobjects/Enemy.java
	GameDemo/src/com/angrynerds/gameobjects/Map.java
	GameDemo/src/com/angrynerds/gameobjects/Player.java
	GameDemo/src/com/angrynerds/ui/Lifebar.java