history display is working
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/cyclop/web/components/column/CollectionViewPanel.html