ADLM modif 21/07
Merge branch 'master' of https://github.com/optimusThePrime/multiform

Conflicts:
	src/App/AdminBundle/Controller/DefaultController.php