Merge branches 'develop' and 'staging' into staging
Merge branches 'staging' and 'master'
Merge branches 'develop' and 'staging' into staging
Merge branches 'staging' and 'master'
fix ID error
Merge branches 'master' and 'develop' into develop
preorder with bitcoin
paypal payment added&tested, 3%+fixed fee