samme på gh-pages
Merge branch 'gh-pages' into tmp

Conflicts:
	.idea/workspace.xml