landing
Merge branch 'master' of https://github.com/SergeevDmitry/t-arona

Conflicts:
	src/SolidTrust/FtdBundle/Resources/views/Admin/help.html.twig
	src/SolidTrust/FtdBundle/Resources/views/Admin/settings.html.twig