#25: Added possibility to have a survey and vote macro within the comments. The behaviour of the REST based resources have to be adjusted still, namely export and locking