Merge branch 'hotfix/1.3.1'
fixed pom version
fixed conflict
Merge branch 'release/1.5'
updating poms for 1.5.1 hotfix
updating poms for 1.5.1 hotfix
updating develop with hotfix versions to avoid merge conflicts
Merge branch 'hotfix/1.5.1' into develop