Merge remote-tracking branch 'origin/master' into qcm

Successfully merged both branches
Minor Changes to The View Dimensions, in order to integrate the
MCQPanels without overlapping
Merge remote-tracking branch 'origin/qcm' into qcm