Small changes
Merge conflicts
Add some Facility services
Add some Facility services
Add FacilitiesManagementActivity base functionality