Merge branch 'gh-pages'

Conflicts:
	README.md
	features/description_section.feature
	features/explore.feature
	features/links_section.feature
	features/medialinks_section.feature
	features/title_section.feature
	features/update.feature