add login
Merge branch 'master' of https://github.com/nancevano/oggi_ng

Conflicts:
	app/scripts/app.js
	app/styles/main.scss