Merge branch 'master' of https://github.com/hrivera787/gaiaehr

Conflicts:
	dataProvider/PoolArea.php