Merge branch 'develop' of https://github.com/bakasajoshua/PhilosophicalAnthropology into develop

Conflicts:
	application/modules/admin/views/admin_home.php
merges
Merge branch 'develop' of https://github.com/johnotaalo/PhilosophicalAnthropology into develop

Conflicts:
	application/modules/admin/views/admin_home.php
Changes to admin home page