Correcting typos.
Merge branch 'master' of git://github.com/gaiaehr/gaiaehr

Conflicts:
	classes/dbHelper.php
Merge conflicts.
model cleaner