Correct the version in the main pom after merging
Merge feature/stabilization into master branch
Merge master into feature/statbilization branch