WIP - Refactoring for new database class
Merge branch 'master' of https://github.com/greenqloud/qloudsync