Merge branch 'master' of https://github.com/pivotaccess2007/iminsi-gihumbi
ui stuff

ui stuff
ui stuff

ui stuff
Merge remote-tracking branch 'marvin/master'

Conflicts:
	frontend/html/predash.html
	frontend/html/reddash.html