[Composer] Add PHPUnit in require-dev & use it in travis
PSR2 compatibility
Update CHANGELOG
Merge branch '2.0'

Conflicts:
	Form/Type/CKEditorType.php
	Tests/Form/Type/CKEditorTypeTest.php
	Tests/Template/AbstractTemplateTest.php
	composer.json