Merge branch 'master' of https://github.com/RiscaJack/HCMP
New Consumption changes
Final
New 29th part 1
Part 2
Merge branch 'master' of https://github.com/Mureithi/HCMP

Conflicts:
	application/views/template.php