Fixed bug with non-escaped characters in sqlite strings in db_sqlite.cpp
Added additional calls to registerError() in auto_db.cpp
resolve merge conflicts