fixed #225
Merge branch 'layout/toolbar' of github.com:entwinemedia/weblounge into layout/toolbar