* release/2.11:
  FREEI-140 - Fix hack for low resolution displays to only apply to things in the menubar
  Update for license file

Conflicts:
	README.md
	amp_conf/htdocs/admin/assets/js/script.legacy.js
	amp_conf/htdocs/admin/bootstrap.php
	amp_conf/htdocs/admin/config.php
	amp_conf/htdocs/admin/libraries/BMO/Cron.class.php
	amp_conf/htdocs/admin/libraries/freepbx_conf.class.php