add stock_id to stock models and ota restore
sort stock block by stock-id when multiple stocks exist
fix query bug, update string representation of stocks to includ stock_id
Merge pull request #150 from dimagi/stock-id

add stock_id to stock models and ota restore