Update app-name for #7
Synchronize for #8.
Merge branch 'master' into develop

Conflicts:
	src/main/resources/default.conf
Bumped version and updated CHANGELOG