Fix merge conflicts
Merge branch 'master' of github.com:SE2Prj-FAITH/FAITH-ServerComponent
Modify services for Facility Management Activity