Fix maven build
Merge remote-tracking branch 'emergentorder/master'

Conflicts:
	pom.xml