Bla Bla Bla
Bla
Bla
Merge branch 'master' into m2

Conflicts:
	NATS/src/at/stefan/nats/GameEnvironment.java
	NATS/src/at/stefan/nats/nats.java