131022
merge conflict file
Merge branch 'master' of https://github.com/vanhong/stock_analysis

Conflicts:
	stock_analysis/templates/analysis/revenue.html
131022
update filter.js
merge revenue.html