fixed apply for map injection
Small changes
Merge branch 'andreas' into mikkel

Conflicts:
	vendor/assets/javascripts/loadmaster_assets/angular/controller.js

vendor/assets/javascripts/loadmaster_assets/angular/controllers/mapCtrl.
js