Merge branch 'master' of github.com:tracim/tracim

tracim/tracim/public/_caldavzap/resource.js

     }).done(function (data) {
       var currentICS = parseInt(inputResource.displayvalue.replace('.ics', ''))
 
-      var regExpUser = new RegExp('\/cal\/user\/')
-      var regExpWorkspace = new RegExp('\/cal\/workspace\/')
+      var regExpUser = new RegExp('\/user\/')
+      var regExpWorkspace = new RegExp('\/workspace\/')
 
       var user_or_workspace