Merge branch 'edge' into mikkel
small
Merge branch 'andreas' into mikkel
pulled edge
Merge branch 'andreas' into mikkel
only fetch access token page on no acces token...
simpler page layout
Merge branch 'andreas' into mikkel
simple accuracy filtering
Merge branch 'andreas' into mikkel
always remove maps#
Merge branch 'andreas' of github.com:AreWeThereYeti/loadmaster_assets into andreas
small changes
dont change page untill push to db successfull
small function
Merge branch 'andreas' into mikkel

Conflicts:
	vendor/assets/javascripts/loadmaster_assets/angular/controller.js
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
no trigger create