Initial
Merge branch 'master' of https://github.com/Shohiek/CD4

Conflicts:
	application/modules/charts/controllers/tests.php
	application/modules/home/controllers/reporting_rates.php
	application/modules/home/models/home_model.php
	application/modules/home/views/home_footer_view.php
	application/modules/home/views/reporting_rates_view.php
	application/modules/nacp/controllers/nacp.php
	application/modules/nacp/models/nacp_model.php
	application/modules/nacp/views/nacp_home_view.php
	application/modules/poc/controllers/reports.php
	application/modules/template/controllers/template.php