Converted from mongo to backbone-websql (sqlite3)
Merge remote-tracking branch 'origin/master'