C2

C2
Merge branch 'beta1.0' of https://github.com/discolt/store-cloud into beta1.0