Bumped the version again to fix a problem in 1.0.6.
Merge branch 'master' into devel

Conflicts:
	pom.xml
Added the functionality required for BZ#1011904 - Support multiple config files.