Move text2html() to separate static section
phpdoc/optimize
Abstract compose file upload determination into IMP_Compose method
[mms] Hide attachment upload UI in dynamic view if file uploads are disabled.
Merge branch 'master' into imp_6_1

Conflicts:
	imp/compose.php
	imp/docs/CHANGES
	imp/lib/Dynamic/Compose/Common.php
	imp/package.xml