Merge branch 'master' of github.com:qcubed/framework into feature-SimpleTableUpdate

Conflicts:
	includes/qcubed/_core/base_controls/QSimpleTableBase.class.php
	includes/qcubed/_core/base_controls/QSimpleTableColumn.class.php
Merge
test