Fixed isAjax()
Updated enetity generator to extend the right classes
Fixes for oosql query builder where(), andwhere()
Merge local with github
Merge local with github