Switching out mysql for sqlite
Merge branch 'develop'