fixed conflict
[maven-release-plugin] prepare release composite-uoa-web-1.2
[maven-release-plugin] prepare for next development iteration