pom update
Merge branch 'master' of https://github.com/pm429015/My-Post

Conflicts:

target/m2e-wtp/web-resources/META-INF/maven/com.defysope/nedesona/pom.pr
operties