Merge remote-tracking branch 'pivot/master'
Merge remote-tracking branch 'pivot/master'
Merge remote-tracking branch 'marvin/master'
Merge remote-tracking branch 'pivot/master'
Merge pull request #3 from pivotaccess2007/master

tabular
Merge remote-tracking branch 'pivot/master'
Merge remote-tracking branch 'pivot/master'
Small things. Red alert.
Merge remote-tracking branch 'pivot/master'

Conflicts:
	frontend/html/basictable.html
Merge remote-tracking branch 'pivot/master'
Merge remote-tracking branch 'marvin/master'
Nutrition.
CHILD STATUS
Merge branch 'master' of https://github.com/revence27/iminsi-gihumbi
Merge branch 'master' of https://github.com/pivotaccess2007/iminsi-gihumbi
ui stuff

ui stuff