login functionality setup
Merge origin/master

Conflicts:
	scripts/app.js