intermediate commit
Merge branch 'master' of https://github.com/kruegsch/IGGJ7_Laika

Conflicts:
	core/src/de/hamburg/laika/Laika.java
Merge branch 'master' of https://github.com/kruegsch/IGGJ7_Laika
minor fixing npe