Changes for working on Mac.
Adding base for PHPUnit.
Changes for working on Mac.
Merge branch 'develop' of https://github.com/HectorOrdonez/selfology

Conflicts:
	application/config/system.php
	public/js/general.js
Merge branch 'master' into develop

Conflicts:
	public/js/general.js