resolve conflicts
resolve conflicts

gamal-ahmed/FacebookMessanger_WatsonDialog_VirtualAgent,gamal-ahmed/FacebookMessanger_WatsonDialog_VirtualAgent,gamal-ahmed/FacebookMessanger_WatsonDialog_VirtualAgent