Merge branch 'schatz' into 'master'

Conflicts:
	code/src/level.cpp
	code/src/level.h
	code/src/levels/test/test.lvl