fixing attachement issue
Merge branch 'develop' into fix/attachement
fixed some typos
Merge pull request #410 from hpi-swt2/fix/attachement

fixing attachment issue