added bitcoin
Merge branch 'develop' into staging
merge from dev
Merge branch 'staging'