Merge branch 'develop'
Change badgets to match branch master.
Add hotfixes for layout.
Merge branch 'hotfix-design'