Reworking map
Merged, map almost working stupid scolling thing is broken.
merging with master
Merge remote-tracking branch 'origin/master' into ReworkingMap
Working updated map,
Working updating map, ie scroll 2k and it will recall radarsearch
ready to start calling mealservice
Merge remote-tracking branch 'origin/workingModals' into ReworkingMap

Conflicts:
	app/client/js/controllers/main-controller.js
merged some of jesper's changes and added a test button