Merge pull request #42 from CounterpartyXCP/develop

1.4.0
Merge pull request #43 from CounterpartyXCP/develop

sync to develop, 1.5.0 PRE
Merge pull request #45 from CounterpartyXCP/develop

1.5.0 PRE2
Merge pull request #46 from CounterpartyXCP/develop

armory: forgotten import
Merge pull request #47 from CounterpartyXCP/develop

Develop
make armory address work on testnet
fix orders consolidation
Merge pull request #48 from CounterpartyXCP/develop

Develop
fix armory server (so it properly updates blocks now)
remove debug line
Merge pull request #49 from CounterpartyXCP/develop

Develop
Fix util#is_valid_url for url value None
Merge pull request #50 from larskluge/develop

Fix util#is_valid_url for url value None
blockr API handles missing txes more gracefully
blockr api tweak
fix decimal price
[CounterpartyXCP/counterwallet#372] fix orders for no divisible assets
Start of API docs
Merge branch 'master' of https://github.com/45rpm/counterblockd
Update .gitignore