Numerous changes and bugfixes
Add support for x-auth-token headers
Merge branch 'mike_nov11_changes'

Conflicts:
	stylesheets/custom/desktop/login_desktop.css
	views/map.html

Resolved two merge conflicts, now concluding the merge
Minor tweaks and cleanup