Update readme
Merge branch 'develop'
Merge remote-tracking branch 'refs/remotes/origin/develop'
Cleanup build configurations