New
Merge branch 'master' of https://github.com/KevinMarete/UPID
poverty: literacy indicator
Merge branch 'master' of https://github.com/KevinMarete/UPID

Conflicts:
	.htaccess
	application/models/m_security.php
Merge branch 'master' of https://github.com/KevinMarete/UPID
db changes
adding schools
Merge branch 'master' of https://github.com/Mureithi/UPID
Reports
Merge branch 'master' of https://github.com/mukundi/UPID
Databases
Db