Fix login code.
Merge branch 'master' of https://github.com/sgcote/intermap.git

Conflicts:
	IntermapServer/index.js