Renamed _insert and _update to _insertRow and _updateRow to avoid CF11 conflicts
Merge branch 'master' into 2.0

Conflicts:
	hq/config/config.xml.cfm