modified:   docs/gettingstarted/index.rst
	new file:   docs/gettingstarted/mysql-application.yml
	new file:   docs/gettingstarted/mysql-deployment-moved.yml
	new file:   docs/gettingstarted/mysql-deployment.yml
	new file:   docs/gettingstarted/mysql-example.rst
	modified:   mysql-example.rst
	modified:   mysql-example.rst
	modified:   mysql-example.rst
	modified:   mysql-example.rst
Merge branch 'master' into docs-mysql-example-460

Conflicts:
	docs/gettingstarted/index.rst
	modified:   docs/gettingstarted/mysql-example.rst
	modified:   docs/gettingstarted/mysql-example.rst
Merge branch 'master' into docs-mysql-example-460
Merge branch 'docs-mysql-example-460' into doc-environment-variables-593
	modified:   docs/advanced/configuration.rst
	modified:   docs/advanced/whatsnew.rst
	modified:   docs/gettingstarted/mysql-application.yml
	modified:   docs/gettingstarted/mysql-example.rst
	modified:   docs/advanced/whatsnew.rst
	modified:   docs/gettingstarted/mysql-application.yml
	modified:   docs/gettingstarted/mysql-example.rst
	modified:   docs/gettingstarted/mysql-example.rst
	new file:   docs/gettingstarted/mysql.Vagrantfile
	modified:   docs/gettingstarted/mysql-deployment.yml
	modified:   docs/gettingstarted/mysql-example.rst
	modified:   docs/gettingstarted/mysql.Vagrantfile
addresses review comments
modified:   docs/gettingstarted/mysql-example.rst
give correct default password in instructions
Merge pull request #617 from ClusterHQ/doc-environment-variables-593

Doc environment variables 593