Merge branch '2.x/develop' of https://github.com/sharpefolio/sharpefolio into 2.x/develop
Merge branch '2.x/develop' of https://github.com/sharpefolio/sharpefolio into 2.x/develop
fix price calc