Merge origin/master

Conflicts:
	Dezibel/src/de/dezibel/data/Album.java
Merge branch 'master' of https://github.com/schmokko/Dezibel