Merge remote branch 'heber/Bugfixes_Tremolo_implementation'
git-svn-id: https://svn.version.fz-juelich.de/scafacos/trunk@1309 5161e1c8-67bf-11de-9fd5-51895aff932f