Updates to forms
Merge branch '1.0.8-RELEASE'
Fixes and improvements to attachments/uploads