Conflicts:
	config/application.config.php
Merge branch 'hotfix/68'

Close #68