fixing bugs
Refactoring DBMS. Now exposing two different ways to query.
Merging master into web. Solving conflicts
Refactoring DBMS
Merge branch 'master' into web
Now returning the lastID
Merging changes from remote origin