Merge pull request #268 from will123195/2.2

use mem()
Merge pull request #269 from will123195/2.2

undo recent force_db changes
Added BASIC functions support to AQL , and added elapsed line numbers .
Merge pull request #280 from cjemagid/2.2

Added BASIC functions support to AQL , and added elapsed line numbers .
aftercommit
eol
Merge branch 'upstream/2.2'

Conflicts:
	lib/class/class.Model.php