bob bugfixes & style; genre filter geht nicht
Merge branch 'master' of https://github.com/papyrus-project/papyrus

Conflicts:
	protected/views/site/bob.php
Merge branch 'master' of https://github.com/papyrus-project/papyrus