merge
Merge branch 'master' of
git@github.com:ISI-nc/fragaria-adapter-rewrite.git

Conflicts:
	pom.xml