Fixed trimLength still adding an ellipsis when the string matched the original string (due to non-word-cutting).
By default, debug now no longer shows strict errors. You can now set debug to "full" to show strict and notices.
bah
I have no idea why this was being double decoded.
Ok, this was stored this way "properly" at the moment anyway. Will change in 4.2.
Fixed some field options not being sortable.
Should only convert non-hidden elements to custom controls.
Last solution was breaking stuff hidden behind tabs.
Fixed "Edit in Developer" showing up for non-developers.
Moved file manager thumbnail settings into a newly named setting that's properly stored as an Array of Items now instead of a goofy double encoded JSON string.
Related to last commit.
Moved to PHPMailer from htmlMimeMail since the latter isn't supported anymore and uses deprecated functions.
Merge branch '4.1-devel' into 4.2-devel

Conflicts:
	core/admin/ajax/file-browser/upload.php
	core/admin/js/main.js
	core/admin/modules/developer/upgrade/database.php
	core/admin/router.php
	core/inc/bigtree/admin.php