pom
Merge branch 'dev'

Conflicts:
	QorderWS/target/m2e-wtp/web-resources/META-INF/maven/com.qorder/qorderws/pom.properties
Remove target dir (recursively)
Added ignore for /target folder
Merge branch 'master' into dev