Merge pull request #58 from popcm/release-1.1

Label typo fixed
Change ajax query to only query for enabled resource option sets
Merge pull request #60 from markofcc/bugfix/PCBK-176_Disabled-resources-are-still-showing

Change ajax query to only query for enabled resource option sets
Update resources queries to only return active and not deleted records
Merge pull request #61 from markofcc/bugfix/PCBK-187_Do-not-show-deleted-resources-on-new-booking

Update resources queries to only return active and not deleted records
PCBK-171 Fixed: create new feature to alter merged contact in booking table