Update login page
Merge remote-tracking branch 'origin/master'

Conflicts:
	frontend/app/views/login.html
Merge remote-tracking branch 'origin/master'
Update module to package.json
Update module to package.json