Adding new configuraciones to app.js

Following this example for user login;
http://scotch.io/tutorials/javascript/easy-node-authentication-setup-and
-local
minor changes
Merge branch 'master' into mgd-login

Conflicts:
	app.js
	app/server/router.js
	package.json
Fixing conflits
Merge branch 'master' into develop
Implementing node-login views and passport

there is an error while routing signup
Funciona la renderización páginas login y signup
Updating JADE templates
Local login is working
Merge branch 'mgd-login' into develop
Merge branch 'develop'