Merge branch 'release/2.0.0'
Merge branch 'release/2.0.0'
Merge branch 'release/2.1.0'
merging release/2.1.0' into master
Merge branch 'release/2.2.0'
merging release/2.2.0' into master
fixed smartimage missing ./ in name
updated config of jgitflow plugin
updating poms for 2.2.1 hotfix
updating develop with hotfix versions to avoid merge conflicts
Merge branch 'hotfix/2.2.1' into develop
squashing hotfix/2.2.1' into develop
updating poms for development
Merge branch 'develop' of github.com:Citytechinc/cq-component-maven-plugin into develop
fixing version