Merge branch 'revence27-master'
ui stuff

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

Conflicts:
	frontend/html/ccmdash.html
	frontend/html/ccmdash_table.html
	frontend/html/reddash_table.html
	iminsigihumbi.py
fix merge
Merge remote-tracking branch 'marvin/master'

Conflicts:
	iminsigihumbi.py
Merge remote-tracking branch 'pivot/master'

Conflicts:
	iminsigihumbi.py