Moved assets to base.html.twig
Merge branch 'master' into secured