update version
Merge branch 'develop' of github.com:obearn/project

Conflicts:
	conf/dependencies.yml
Merge remote-tracking branch 'origin/qa'
Merge remote-tracking branch 'origin/qa'
Merge remote-tracking branch 'origin/qa'
Merge remote-tracking branch 'origin/qa'
Merge remote-tracking branch 'origin/qa'
Problème de suffixe sur le master
Merge branch qa, module version update
Merge remote-tracking branch 'origin/qa'
Merge branch qa, module version update
Merge branch qa, module version update
Merge branch qa, module version update
Update version module 1.3.0-dev
Update version project 1.4.0-dev
Merge branch develop, module version update