Merge branch 'hotfix/1.0.1'
Merge branch 'release/1.2'
Merge branch 'release/1.3'
updating poms for 1.3.1 hotfix
fixed hotfix 1.3.1
updating poms for 1.3.1 hotfix
updating develop with hotfix versions to avoid merge conflicts
fixed conflict