Rename local development environment
Merge branch 'master' into develop

Conflicts:
	bootstrap/start.php