cs + little bugfixes + travis support
Merge branch '2.3' of github.com:victoire/CmsBundle into 2.3

* '2.3' of github.com:victoire/CmsBundle:
  cs + little bugfixes + travis support

Conflicts:
	Tests/Controller/App/AppKernel.php
	Tests/tests/autoload.php.dist
	phpunit.xml.dist