pre pull
Merge branch 'master' of ssh://github.com/JMaltat/fragaria-reflection

Conflicts:
	pom.xml