changing version in readme
adding ownership copyright to license
fixing merge conflict in pom