update pom
Merge remote-tracking branch 'origin/master'

Conflicts:
	jawr-core/pom.xml
	pom.xml