CHANGELOG.txt and Pom
update .gitignore
Merge branch 'master' into develop