Login fixed
Merge branch 'master' into milestone

Conflicts:
	scripts/core.js