Merge branch 'develop'
Merge branch 'master' of https://github.com/bitdns/bitdns
merge
disable dns operations
replace dev keys
ulog -> ilog
merge
release config
fix genesis block
Move genesis to match master before merge
Merge master
Merge branch 'master' into develop
merge
Merge branch 'release' into develop
merge
Bump chain version to match release
Merge branch 'develop' of github.com:keyid/keyid into develop

Conflicts:
	libraries/blockchain/include/bts/blockchain/dns_config.hpp
set spotlight as feed
Merge pull request #26 from vikramrajkumar/keyid

Merge master
substitute keyhotee AGS key