Prepare Cegid demo
Merge branch 'pr/7'

Conflicts:
	configuration/configuration.json
	configuration/configuration_2.json
	src/main/resources/localsettings.properties