Merge remote-tracking branch 'refs/remotes/origin/rc-2.3.1' into dev-v3

Conflicts:
	README.md
	assets/_core/php/examples/dynamic/qcheckboxcolumn.php
	assets/php/examples/more_codegen/type_tables.php
	assets/php/examples/mysql_innodb.sql
	assets/php/examples/pgsql.sql
	assets/php/examples/sql_server.sql
	includes/base_controls/QAutocompleteBase.class.php
	includes/base_controls/QFormBase.class.php
	includes/base_controls/QNumericTextBox.class.php
	includes/base_controls/QSimpleTableBase.class.php
	includes/base_controls/QSimpleTableColumn.class.php
	includes/base_controls/_events.inc.php
	includes/codegen/templates/db_type/class_gen/_main.tpl.php
	includes/framework/QQuery.class.php
	includes/framework/QSoapService.class.php
	includes/qcubed.inc.php
	includes/qcubed/_core/base_controls/QActionControl.class.php
	includes/qcubed/_core/base_controls/QCheckBoxColumn.class.php
	includes/qcubed/_core/base_controls/QLabel.class.php
	includes/qcubed/_core/base_controls/QPanel.class.php
	includes/qcubed/_core/base_controls/_enumerations.inc.php
	includes/qcubed/_core/codegen/templates/db_orm/class_gen/associated_objects_methods.tpl.php
	includes/qcubed/_core/codegen/templates/db_orm/class_gen/instantiation_methods.tpl.php
	includes/qcubed/_core/tests/qcubed-unit/ExpandAsArrayTests.php
	includes/qcubed/controls/QImageControl.class.php
	includes/qcubed/controls/QImageLabel.class.php
	includes/qcubed/controls/QMenu.class.php
	includes/qcubed/controls/QSpinner.class.php
	includes/qcubed/controls/QTabs.class.php
	includes/tests/qcubed-unit/BasicOrmTests.php
	qcubed.inc.php