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

Conflicts:
	filter/views.py
	financial/views.py
131031
Merge branch 'master' of https://github.com/vanhong/stock_analysis

Conflicts:
	filter/views.py