add directory to gitignor
commit template import
Merge branch 'login_form'

Conflicts:
	src/Acme/TestBundle/Resources/views/Security/import.html.twig