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

Conflicts:
	stocks/views.py