Add AddFacilityActivity and fixes points discussed at code review
Declare extras as String constants
Fix merge conflicts