test
master
Merge branch 'master' into test

Conflicts:
	src/Application/CoreBundle/Resources/views/contact.html.twig
tt
Merge branch 'master' of github.com:sftec/sftec

Conflicts:
	src/Application/CoreBundle/Resources/views/contact.html.twig
Merge branch 'tt'

Conflicts:
	src/Application/CoreBundle/Resources/views/contact.html.twig