Merge branch 'Bistumssitz'

Conflicts:
	Resources/Private/CoffeeScript/classes/List.coffee
	Resources/Public/JavaScript/classes/List.js