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

Conflicts:
	dataProvider/PoolArea.php
Merge branch 'master' of https://github.com/hrivera787/gaiaehr

Conflicts:
	dataProvider/PoolArea.php
default values for data model
Merge branch 'master' of git://github.com/gaiaehr/gaiaehr