First super
Regress
July
Conflict
bower component
Monday 7
Merge branch 'feature/User_Management'
Merge branch 'feature/super'

Conflicts:
	application/controllers/reports.php
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2

Conflicts:
	application/config/database.php
Merge Conflict
fine tune
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2
changes
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2