cameraHelper modified, haukes layer added

i Please enter the commit message for your changes. Lines starting
new files added
lease enter the commit message for your changes. Lines starting
Dying
controllers added
Merge branch 'master' into tweenTest

Conflicts:
	GameDemo-android/GameDemo-android.iml
	GameDemo-desktop/GameDemo-desktop.iml
	GameDemo-desktop/libs/controllers/controllers.iml
	GameDemo/GameDemo.iml
	GameDemo/libs/libs.iml
	out/production/GameDemo/com/angrynerds/game/collision/Detector.class
iml changed