Merge branch 'develop'
Merge branch 'master' of https://github.com/bitdns/bitdns
merge
release config
merge
Merge branch 'release' into develop
merge
Merge branch 'develop' of github.com:keyid/keyid into develop

Conflicts:
	libraries/blockchain/include/bts/blockchain/dns_config.hpp