update parent
Merge branch 'master' of
git@github.com:openfeed-project/openfeed-archon.git

Conflicts:
	pom.xml