Merge branch 'master', remote-tracking branch 'origin/master'
Adds management stoof for attachments
Merge branches 'dev' and 'master'
Merge branches 'master' and 'dev'
Merge branches 'master' and 'dev'
Yeah
solves conflict
Merge branches 'master' and 'dev' into dev