stay on location page for MM login, pending running whole service over https, hmm
Merge remote branch 'origin/master'