Merge branch 'hotfix/2.3.2'
merging hotfix/2.3.2' into master
added additionalParameters to missing widgetMakers
updated versions for hotfix
updating poms for 2.3.3 hotfix
updating develop with hotfix versions to avoid merge conflicts
Merge branch 'hotfix/2.3.3'
merging hotfix/2.3.3' into master
Merge branch 'hotfix/2.3.3' into develop
squashing hotfix/2.3.3' into develop
updating poms for development
version bump.
fixed links generation.
Merge branch 'hotfix-2.3.4' into develop

Conflicts:
	cq-component-annotations/pom.xml
	cq-component-maven-plugin/pom.xml
	pom.xml
Merge branch 'develop' of https://github.com/Citytechinc/cq-component-maven-plugin into develop

Conflicts:
	cq-component-maven-plugin/pom.xml
	pom.xml