[maven-release-plugin] prepare release wro4j-parent-1.6.3
fix merge conflicts
Merge branch '1.7.x'
Merge branch '1.7.x'
release v1.7.3
Merge branch '1.7.x'
Merge branch '1.7.x'
Merge remote-tracking branch 'origin/1.7.x' into 1.7.x
Merge remote-tracking branch 'origin/1.7.x' into 1.7.x
start new development iteration