Added changes to pom
Added merge
added
Merge branch 'master' of github.com:corewalk/geb

Conflicts:
	pom.xml