fix flujos login - prompt
Merge branch 'master' of github.com:javrod83/the_fram

Conflicts:
	app/scripts/app.js