rm br after rhino
Merge branch 'origin/feature-gui'

Conflicts:
	app/routes/login/login.html