soap templates / snippets
Merge branch 'master' of git://github.com/hrivera787/gaiaehr
soap templates / snippets
soap templates / snippets
soap templates / snippets
controller
few store models fixed
encounter encounter_codes_hcpcs removed
Merge branch 'master' of git://github.com/gaiaehr/gaiaehr

Conflicts:
	classes/dbHelper.php

Fixed.