backport logo
google analytics
dates fix
charset fix
Merge branch 'master' into demo

Conflicts:
	chat.html
	js/app.js
fix