Merge branch 'hot-fix/database-migration'
Merge branch 'develop'
[N/A] Rename README.rdoc to README.md

Reviewed by N/A
Merge branch 'hot-fix/README' into develop