Update version
Update version
Merge branch 'develop' of github.com:obearn/module2 into develop

Conflicts:
	conf/dependencies.yml
Update version module-core
Update version module-core
Merge branch develop, module version update
Merge branch qa, module version update