change
fixed conflict Merge branch 'master' of https://github.com/ninomllr/projectoss

Conflicts:
	ch.bfh.kepler.domain/.classpath
MoviRepo
do1