Merge branch 'feature/stabilization'
UI-3197 Edited Branding Page
Merge branch 'feature/stabilization'
Merge master into feature/weemo-addon branch