add timeline
Merge branch 'master' of github.com:jamesdonelan/chatterbox

Conflicts:
	web-ui/app/routes/streamingRoute.js