Stock info
Merge remote-tracking branch 'origin/StockInfo'

Conflicts:
	Msi-Project/src/com/mercury/demand/web/controller/AppController.java