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
Merge pull request #48 from CounterpartyXCP/develop

Develop
Merge pull request #49 from CounterpartyXCP/develop

Develop
Start of API docs
Merge branch 'master' of https://github.com/45rpm/counterblockd
Update .gitignore
More doc
Merge pull request #51 from CounterpartyXCP/develop

Merge Develop in Master
More doc
Merge pull request #52 from CounterpartyXCP/develop

Develop
Finish API docs
Merge pull request #53 from 45rpm/master

API docs for counterblockd
Merge pull request #54 from CounterpartyXCP/master

sync back