Fixed staging bugs in develop branch.
Merge branch 'staging' into develop
add merchant bitcoin