Added new login screen (and other changes)
Merge remote-tracking branch 'origin/master' into chermug2

Conflicts:
	package.json