pulled from dev
Merge branch 'master' of https://github.com/akalke/Stockd into dev