fixed service calendar translation
changing encodedshape to text type
Merge branch 'master' into setravi