add stock.js file
resolve conflicat ItemController file
Merge branch 'master' of https://github.com/fortkle/athena