edit chat
Merge branch 'testing' of https://github.com/tinyjing/Genesys-Hackathon

Conflicts:
	public/js/services.js
Merge branch 'testing' of https://github.com/tinyjing/Genesys-Hackathon

Conflicts:
	public/css/chat.css
	public/js/services.js
	views/partials/chat.html