Open login form in new window
Merge remote-tracking branch 'origin'

Conflicts:
	views/button.ejs
Login and welcome pages
Merge remote-tracking branch 'origin'