resolve conflict
Merge remote-tracking branch 'origin/master'

Conflicts:

	target/m2e-jee/web-resources/META-INF/maven/anes-work/anes-work/pom.properties