As of September-30
Merge remote-tracking branch 'origin/master' into source

Conflicts:
	_config.yml
	source/_includes/custom/navigation.html
	source/contact/index.markdown
	source/index.markdown
	source/sample/index.markdown