Update gh-pages
Merge branch 'gh-pages' of https://github.com/magento/devdocs into gh-pages

Conflicts:
	guides/v1.0/config-guide/config/config-files.html
	guides/v1.0/frontend-dev-guide/themes/theme-create.html
	guides/v1.0/install-gde/install/sample-data.html