Ernesto contributing on the code.
Merge branch 'master' of git://github.com/gaiaehr/gaiaehr

Conflicts:
	classes/Matcha/MatchaCUP.php
Matcha::connect - Fixing some try & catchs errors and array issues.
Matcha::connect - Correcting some typos.
Matcha::connect - Added new method __renderTableOptions.
errors
Merge branch 'master' of https://github.com/hrivera787/gaiaehr