cosmetic changes and login enhancements
Merge branch 'master' of https://github.com/iMMAP/OasisWebMapping

Conflicts:
	js/APP.js