don't know
Merge branch 'master' of https://github.com/ninomllr/projectoss

Conflicts:
	ch.bfh.kepler.domain/pom.xml
fixed conflict