Merge pull request #204 from annando/master

fromgplus: Picture upload/usage of Object-Type and GUID
Merge remote-tracking branch 'upstream/master'
The GUID in the link to the items has to be encoded, since it could contain special characters