new phpcs
Merge branch 'master' of github.com:itdoors/CommonBundle

Conflicts:
	Services/ExportService.php
	Twig/BaseTableExtension.php