Moved assets back to app/assets

The reason is that menubar and background.png is used in the admin
panel. Since the goal of theming is to theme the blog and not the
admin, those 2 assets were moved back to app/assets
Merge branch 'master' into marmite