`
re-config logging
Merge branch 'master' into topic/service-provider

Conflicts:
	.gitignore