Merge remote branch 'origin' into nwallen-master

Conflicts:
	traveler/static/js/travelermap.js
	traveler/static/themes/default/mapstyles.js
Merge branch 'master' of https://github.com/nwallen/OpenLocast-Web into nwallen-master

Conflicts:
	traveler/templates/root.django.html