chart in quote details
Merge branch 'master' of https://github.com/wjshea1/webdev

Conflicts:
	app/js/streamer/streamermanager.js
	app/js/views/charts-view.js
	index.html