Merge branch '1.1.0' of https://github.com/Bernadskaya/WebBundle into 1.1.0

Conflicts:
Resources/views/News/show.html.twig
change news/show.html.twig