131017
update drawCharts
131017
change something

Merge branch 'master' of https://github.com/vanhong/stock_analysis

Conflicts:
	static/js/drawChart.js
	stock_analysis/settings.py