Rename genesis file to prevent merge conflicts from upstream
Move genesis to match master before merge
Merge master
Merge branch 'master' into develop
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
Merge pull request #26 from vikramrajkumar/keyid

Merge master