Merge branch 'master' of github.com:RufusMbugua/UPID
Merge branch 'master' of github.com:KevinMarete/UPID
New entities+modified db
Merge branch 'master' of https://github.com/JohnAdamsy/UPID

Conflicts:
	.project