Merge branch 'dev_customcss' into preinstall
Merge branch 'dev_ignoremarkdown' into preinstall
Merge branch 'dev_imgrotation' into preinstall
Merge branch 'dev_imgrotation_thumbs' into preinstall
Merge branch 'dev_attachplus' into preinstall
merge with master and devs