switched from sqlite to mysql
Merge branch 'master' into database