additional search functionality added
fixed merge conflicts with core data model
Fire alarm panel building field reinserted for core data, search by number and street address