Merge branch 'dev' into feature_dsa

lib/db/json.js

@@ -82,6 +82,10 @@ function flush() {
 function sync() {
   try {
     db = JSON.parse(fs.readFileSync(dbPath));
+
+    // FIXME:
+    // at this point db might be missing some important fields
+    // we may want to fix this. In the meantime, delete your old json db
   } catch(e) {
     logger.error("Cannot read database from " + dbPath);
   }