Remove client files for testing
Merge branch 'master' into development

Conflicts:
	public/client.html
	public/js/app-client.js