a
Merge branch 'master' of https://github.com/duty-dev/duty.git

Conflicts:
	duty Maven Webapp/src/main/resources/properties/generatorConfig.xml