FREEPBX-7344 #QA #comment Fixing old bug
Merge branch 'release/2.10' into release/2.11

* release/2.10:
  FREEPBX-7344 #QA #comment Fixing old bug

Conflicts:
	amp_conf/htdocs/admin/libraries/view.functions.php
Merge branch 'release/2.11' of ssh://git.freepbx.org/freepbx/framework into release/2.11

# By Bryan Walters (4) and others
# Via Bryan Walters (2) and Anthony Lewis (1)
* 'release/2.11' of ssh://git.freepbx.org/freepbx/framework:
  Fix css for login view to prevent mis-alignment
  [Module Tag script: framework 2.11.0.35]
  no message
  [Module Tag script: framework 2.11.0.34]
  FREEPBX-1953 - bumping version in module.xml for release
  FREEPBX-1953 - Move module_get_field_size to prepare statement
  FREEPBX-1953 #QA #comment Minor formatting fix of new js functions
  FREEPBX-1953 #QA #comment Changed components.class.php to use htmlspecialchars instead of htmlentities when throwing back contents of textboxes to avoid garbled text
  Reverted since I pushed with wrong name "FREEPBX-1953 #QA #comment Changed components.class.php to use htmlspecialchars instead of htmlentities when throwing back contents of textboxes to avoid garbled text"
  FREEPBX-1953 #QA #comment Changed components.class.php to use htmlspecialchars instead of htmlentities when throwing back contents of textboxes to avoid garbled text
  FREEPBX-1953 #QA #comment Added some extra functions and modified existing ones in script.legacy.js to help with UTF8 character validation