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

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

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

Conflicts:
	application/modules/test/controllers/test.php
just a change

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>
Merge branch 'feature/concurrent_charts' into develop
Merge branch 'develop' of https://github.com/MwangiKevin/CD4 into develop
just a commit

Signed-off-by: unknown <rmtesigwa@CHAILEN-5KCAX.clintonhealthaccess.org>
Merge remote-tracking branch 'kevin/develop' into feature/concurrent_charts
concurrent equipment_test_column chart working

Signed-off-by: unknown <rmtesigwa@CHAILEN-5KCAX.clintonhealthaccess.org>
Merge branch 'feature/concurrent_charts' of https://github.com/mtesigwa/CD4 into feature/concurrent_charts