Tabs in twig extension
Remove FOS User bundle, it wasn't being used anyway
Merge branch 'master' into develop