Merge remote-tracking branch 'origin/2.0.x'

Conflicts:
	site/src/main/java/org/soluvas/web/site/widget/CollectionColumn.java
	site/src/main/java/org/soluvas/web/site/widget/CollectionColumnPanel.java