ejs and passport authentication
Merge branch 'master' of https://github.com/duke-stephenson/rpe

Conflicts:
	client/modules/app/src/login/login.js
	client/modules/app/src/login/login.tpl.html