Merge branch 'develop' of https://github.com/johnotaalo/PhilosophicalAnthropology into develop
Merge branch 'develop' of https://github.com/johnotaalo/PhilosophicalAnthropology into develop
content
freedom/sexuality
ADMIN
Merge branch 'develop' of https://github.com/bakasajoshua/PhilosophicalAnthropology

Conflicts:
	application/config/autoload.php
project