Some changes
Some changes
Modify criteria finished
Resolve conflict for daily report

Conflicts:
	SmartStockView/static/js/index.js
Merge pull request #18 from Rothcold/master

Modify criteria frontend finished