Merge branch 'edit' into deploy_client

Conflicts:
	index.html
Merge branch 'edit' into deploy_client
Merge branch 'master' into deploy_client