no changes
Merge branch 'andreas' into mikkel

Conflicts:
	assets/angular/controllers/mapCtrl.js
	assets/angular/directives.js
	assets/angular/templates/map_start.html
working
bug fixes
removing unused assets
ui updtaes
Merge branch 'andreas' of https://github.com/AreWeThereYeti/loadmaster_assets into andreas
no more watch position from api
correct path to templates
mikkel is dupid
pulled mikkel
Merge branch 'mikkel' into andreas
merged mikkel
stuff
bla