combined ORM; added support for with to attach many-to-many relationships
Merge branch '3.3/master' of github.com:kendugu/core into 3.3/master

Conflicts:
	classes/ORM.php