1
Merge branch 'master' of https://github.com/bit-panda/TBClient

Conflicts:

TBClient.xcodeproj/project.xcworkspace/xcuserdata/bitpanda.xcuserdatad/U
serInterfaceState.xcuserstate