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

Conflicts:
	pom.xml