merge fix
about page fixes
Merge branch 'about_page' into catalog_templates

Conflicts:
	src/Enmash/Bundle/PagesBundle/Resources/views/Base/public_base.html.twig
	src/Enmash/Bundle/PagesBundle/Resources/views/Pages/about.html.twig
intermediate