Create local merged config override file.
Merge branch 'newconfig' into develop
Merge branch 'develop' into logging

Conflicts:
	config/local.config.php.dist
Use the correct configuration for logging.
Fix test.
Put default configuration into module config.