contacts changed
Merge branch 'testing'

Conflicts:
	src/Deleer/ShopBundle/Resources/views/General/contacts.html.twig
fixed adding of a product
1.gif
added sql_back
removed parameters yml (from kirill). Added parameters_template.yml
gitignore_content
renamed gitignore_template
renamed to htaccess_template
removed from index app/config/parameters.yml
Merge branch 'master' into testing

Conflicts:
	app/config/parameters_template.yml