Cleaned up Database code, added category and store sqlite code, stubbed out some synchronisation code and cleaned up a bunch of unused imports/redundant initializations and other misc warnings
Merge remote-tracking branch 'origin/master'