Clean up.
Manual merge.
Merge branch 'master' of github.com:mrgimo/mixtape-core

Conflicts:
	src/main/java/ch/hsr/mixtape/Mixtape.java