login new
Merge branch 'master' of https://github.com/blufish/gloo-prototyping

Conflicts:
	src/app/startup.js