test timer
Merge remote-tracking branch 'upstream/master'
optimized AidedColorDataBuilder. tests run in 1 minute
improve receive page
add entry to sendcoinspage
fix send coins
add icons
add rescan action
add widgetsEnabled to p2pTrade
builder.py conflicts fixed
adding time measuring to builder.py tests, with pep8 compliance
starting docs and debugging python-bitcoinlib
README edits
Merge branch 'master' into qt
add ugly data for tradepage
add asset page
Merge branch 'master' into qt
fixed merge conflicts
advancing docs
update tradepage