Minor changes to layout of js
Merge branch 'develop' of github.com:christoffer-Van/ETA into develop

Conflicts:
	eta_rails/app/assets/javascripts/map.js.erb
	eta_rails/app/views/deliveries/index.html.erb