Proj properties
Merge branch 'master' of github.com:RufusMbugua/UPID
Merge branch 'master' of github.com:KevinMarete/UPID
project
Merge branch 'master' of https://github.com/KevinMarete/UPID
Merge branch 'master' of https://github.com/JohnAdamsy/UPID

Conflicts:
	.project
Add Incidents
Merge branch 'master' of https://github.com/RufusMbugua/UPID
poverty: literacy indicator
New entities+modified db
Edit Incident Listing
Merge branch 'master' of https://github.com/KevinMarete/UPID

Conflicts:
	.htaccess
	application/models/m_security.php
Merge branch 'master' of https://github.com/JohnAdamsy/UPID

Conflicts:
	.project
	application/models/Entities/e_security_incidences.php
Merge branch 'master' of https://github.com/KevinMarete/UPID
db changes