131015 filter update
2013-10-17
merge conflict files

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

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