Fix ajax going mental.
Merge branch 'master' into emil-integration

Conflicts:
	app/assets/stylesheets/feed.css.scss