microORM - Progress... almost done.
Merge branch 'master' of git://github.com/gaiaehr/gaiaehr

Conflicts:
	classes/dbHelper.php
microORM - Error handling.
microORM - Error handling working, and finished.
Merge branch 'master' of git://github.com/hrivera787/gaiaehr
encounter CPTs / Dx