minor changes
hier ist nicht viel passiert
Merge branch 'master' of github.com:LukasKalbertodt/cg-14
first version of map
Merge branch 'master' of github.com:LukasKalbertodt/cg-14
Added correct branch to .gitmodule, added script for updating lumina
Fixed EventCallback (now works with newer lumina version)
Merge branch 'master' into basic-structure

Conflicts:
	.gitmodules
update lumina