* application start refactored
* names for environment refactored
Merge branch 'tests' into development

Conflicts:
	core/pom.xml