Merge remote-tracking branch 'marvin/master'

Conflicts:
	frontend/html/predash.html
	frontend/html/reddash.html
Merge remote-tracking branch 'marvin/master'
login intro

login intro