Merge branch 'master' into dev_imgrotation
Make the img rotation function static
Merge branch 'dev_imgrotation' into dev_attachplus