140320 add all
140321 for merge
Merge branch 'master' of https://github.com/vanhong/stock_analysis

Conflicts:
	filter/views.py
	stock_analysis/urls.py