Fix app startup
Merge branch 'master' of https://github.com/Hellblazer/Ultrastructure.git
Merge branch 'master' of https://github.com/Hellblazer/Ultrastructure.git
Merge branch 'master' of
https://github.com/Hellblazer/Ultrastructure.git

Conflicts:
	service/src/test/resources/core.yml