commit template import
Merge branch 'login_form'

Conflicts:
	src/Acme/TestBundle/Resources/views/Security/import.html.twig
Merge pull request #1 from evgeniybilyk/master

pull request: login_form -> master