Merge branch 'edge' into mikkel
Merge branch 'andreas' into mikkel
Merge branch 'andreas' into mikkel
Merge branch 'andreas' into mikkel
Merge branch 'andreas' into mikkel
small changes
small function
Merge branch 'andreas' into mikkel

Conflicts:
	vendor/assets/javascripts/loadmaster_assets/angular/controller.js
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
Merge branch 'mikkel' into andreas