Rename genesis file to prevent merge conflicts from upstream
fix genesis block
Move genesis to match master before merge
Merge master
Merge branch 'master' into develop
Move genesis to prepare for merge with develop
Merge develop
Bump chain version to match release
Merge branch 'develop' into release
Merge pull request #27 from vikramrajkumar/release

Merge develop