new change
Merge branch 'master' of https://github.com/pocolovn/sympocolo

Conflicts:
	src/TMS/Bundle/AdminBundle/Controller/UploadController.php
Merge