Rebase
Merge branch 'develop' of https://bitbucket.org/Menggen/stocktotal into develop
Merge branch 'develop'