Some fixes, and more loading of data moved to the server, instead of fetching it Ajax-wise on page load
Merge branch 'data-push' into push-oneline

Conflicts:
	src/main/webapp/resources/js/scripts.js
Fix for erranous expand-arrow/state on stories, when the expand-arrow of a oneliner was clicked