Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

.gitignore

@@ -269,3 +269,4 @@ TEAMModelOS.FunctionV4/Properties/ServiceDependencies/teammodelfunction-rc - Zip
 /TEAMModelOS/.local-chromium
 
 TEAMModelBI/Properties/ServiceDependencies/teammodelbi-RC - Web Deploy/profile.arm.json
+/TEAMModelOS.Function/local.settings.json