some changes
bg_clouds added
lifebar
Merge remote-tracking branch 'origin/master'

Conflicts:
	GameDemo/src/com/angrynerds/gameobjects/Player.java
pppushh
new buttons
Merge branch 'master' into LifebarBranch
Merge remote-tracking branch 'origin/master'

Conflicts:
	GameDemo/src/com/angrynerds/game/collision/CollisionDetector.java
some changes
set state.idle
Merge branch 'master' of https://github.com/Franjoo/Game
Merge branch 'master' into CollisionPolygons

Conflicts:
	GameDemo/src/com/angrynerds/game/collision/Detector.java
	GameDemo/src/com/angrynerds/gameobjects/Map.java
	GameDemo/src/com/angrynerds/gameobjects/Player.java
	GameDemo/src/com/angrynerds/gameobjects/creatures/Creature.java