Merge branch 'master' into demo

Conflicts:
	readmore/main/templates/main.html
Merge branch 'master' into demo
Merge branch 'master' into demo
Merge branch 'master' into demo
Merge branch 'master' into demo
Merge branch 'master' into demo
Merge branch 'master' into demo
Some changes to more categories button
Merge branch 'pilot' of https://github.com/PerceptumNL/ReadMore into pilot
Merge branch 'master' into demo
Fixed bug with icon article overview
Merge branch 'master' into demo
Topbar better size
Merge branch 'master' into demo
Some vertical rhytm for typography
Merge branch 'master' into demo
Basis for history items
Added migration for history items
Removed unique constraint from user relation to history item
Added all history items