pom.properties
Merge branch 'master' of https://github.com/bookmarkqa/hapi

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/com/hapi/pom.properties