Merge branch 'badges' into dev
Merge branch 'master' into dev
Prepare better layout
Merge branch 'badges' into dev
Improved components layout
Revert helper until emberjs#2474 fixed and worked around
Merge branch 'components'