Merge branch 'master' of http://192.168.1.222:3000/zhengbingbing/NewCallCenter5.1_API

# Conflicts:
#	codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Configs/system.config
#	codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/IVRWordsController.cs

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -295,7 +295,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Configs\log4net.config" />
-    <Content Include="Configs\system.config" />
+    <Content Include="Configs\system.config">
+      <SubType>Designer</SubType>
+    </Content>
     <None Include="Properties\PublishProfiles\1q.pubxml" />
     <None Include="Properties\PublishProfiles\ddr.pubxml" />
     <None Include="Properties\PublishProfiles\my.pubxml" />