Merge branch 'develop'
Change how the JSON database is backed up and created for Android
Merge branch 'master' into develop