Merge remote-tracking branch 'somazx/master'

Conflicts:
	apps/qubit/modules/informationobject/actions/fullWidthTreeViewAction.class.php