starting with bftc color definition
starting BFTC color definition
solving conflict
Merge branch 'master' of https://github.com/maraoz/ngcccbase
unittest compliance
Merge remote-tracking branch 'upstream/master'
tests for BFTColorDefinition
re-add old tests
Issue #87: fix bug with bitcoin transfer
Issue #93: Add Balance column to addressespage
Merge pull request #92 from jimmysong/87

Issue #87: fix bug with bitcoin transfer
Merge pull request #94 from jimmysong/93

Issue #93: Add Balance column to addressespage
Merge pull request #91 from maraoz/master

Issue #27