Merge origin/master
Merge commit '15cf58da1fe7d606e20f8866f09a3228371f0c44' into test

Conflicts:
	src/Metrostudio/ContaktaBundle/Resources/views/Ajax/contact_addFolder.html.twig