some changes to map and other things
edited enemy movements
enemys edited
edited enemys
put debug out
debug edit
Merge branch 'camera' into m2

Conflicts:
	NATS/src/at/clemens/nats/EnemyTypeZero.java
	NATS/src/at/stefan/nats/PauseMenu.java
	NATS/src/at/stefan/nats/SceneManager.java
	NATS/src/at/stefan/nats/UpgradeMenu.java
	NATS/src/at/stefan/nats/nats.java
changed enemyzero
edited enemyzero, enemyone
added EnemyTypeTwo and the small version of it
edited EnemyTypeOne and Zero to respect freeze
edited EnemyTypeZero to not use the Elazity to bounce around (it
calulates it self now)
edited EnemyTypeTwo and Zero
added EnemyBlackHole
Merge branch 'master' into m2

Conflicts:
	NATS/src/at/stefan/nats/GameEnvironment.java
	NATS/src/at/stefan/nats/nats.java
worked on enemiem