camera, world map etc
Merge branch 'master' of github.com:skogler/boom

Conflicts:
	src/client/Game.cpp
	src/client/main.cpp
Merge branch 'master' of github.com:skogler/boom