Output icons complete
Merge branch 'meeting-room' of https://github.com/advancedcontrol/composer-starter-kit into meeting-room