Fix some filtering positioning
Fix filter positioning again
Merge branch 'master' of github.com:groetzingrolf/gotterdammerung

Conflicts:
	static/js/main.js