CMS-1365: All apps - Top bar highligting
Merge remote branch 'origin/master'