Removed progress from database
Rename back to original names awaiting the jtoxcore pull request
Merge branch 'ollieh-master'