Merge branch 'master' into qco_structure
QCO menu splitting calendar.
QCO with new structure.
QCO view with icons.
Removing route QCO.
Merge branch 'master' into qco_structure
Merge branch 'qco_structure'