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

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