v2.0.141
Merge branch 'Gid733-master' # Conflicts: # eFormAPI/eFormAPI.Common/eFormAPI.Common.csproj # eFormAPI/eFormAPI.Common/packages.config # eFormAPI/eFormAPI/Controllers/TemplateFilesController.cs
Merge branch 'Gid733-master' # Conflicts: # eFormAPI/eFormAPI.Common/eFormAPI.Common.csproj # eFormAPI/eFormAPI.Common/packages.config # eFormAPI/eFormAPI/Controllers/TemplateFilesController.cs