главная страница/twig, favicon
главная страница/twig, favicon, +screen.scss
Merge origin/dev into dev

Conflicts:
	src/Gg/MainBundle/Resources/views/Default/experts.html.twig
	src/Gg/MainBundle/Resources/views/Default/index.html.twig
	src/Gg/MainBundle/Resources/views/Default/views.html.twig
	src/Gg/MainBundle/Resources/views/base.html.twig
	src/Gg/MainBundle/Resources/views/layout.html.twig
Merge origin/dev into dev

Conflicts:
	src/Gg/MainBundle/Resources/views/Default/experts.html.twig
	src/Gg/MainBundle/Resources/views/Default/index.html.twig
	src/Gg/MainBundle/Resources/views/Default/views.html.twig
	src/Gg/MainBundle/Resources/views/base.html.twig
	src/Gg/MainBundle/Resources/views/layout.html.twig