Git test k
Git test R
git test g
Merge branch 'master' of https://github.com/mtesigwa/CD4

Conflicts:
	application/modules/test/controllers/test.php
Merge branch 'master' of https://github.com/MwangiKevin/CD4

Conflicts:
	application/modules/test/controllers/test.php
git test correct
User manuals

Added administrators user manual and the nacp user manual
email functionality started
Cleanout
Merge branch 'master' of https://github.com/bakasajoshua/CD4
Merge branch 'master' of https://github.com/MwangiKevin/CD4
Admin Reporting View