Revert 02
Merge branch 'hqd' of https://github.com/nguyenanhnhan/mStore into hqd