Remove composer.lock
Move and update FOSUserBundle's twig layout

- Move vendor view into app
- Make it extend the app's base template and output content into "body" block
Merge upstream/develop into develop
Add composer.lock