edit crap
Merge branch 'master' of github.com:tmbo/Roomp

Conflicts:
	src/apps/MapApp.cc