Cleaning up, making sure things follow convention
Merge branch 'feature/Convention' into develop
Merge branch 'feature/UnitTesting' into develop

Conflicts:
	.core/core.class.php
Merge branch 'develop' into feature/UnitTesting