release of 15.0 version and also updating project version
merging conflicts in the pom.xml