Merge branch 'feature/UnitTesting' into develop

Conflicts:
	.core/core.class.php
Merge branch 'pr/9' into develop

Conflicts:
	.core/modules/data/email.class.php
	.core/modules/data/site.class.php
	.settings/settings.php
Trying out automatic travis ci image
Merge branch 'develop' into release/0.0.2

Conflicts:
	.core/core.class.php