Merge branch 'master' of https://github.com/revence27/iminsi-gihumbi

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