updates in applicationfactory, services and model
Merge branch 'master' of git@github.com:mrgimo/mixtape-core.git

Conflicts:
	src/main/java/ch/hsr/mixtape/application/service/SystemService.java