update composer.json
fix phpdoc
Add Symfony v2.5 to travis
Merge pull request #170 from interstroom/master

Add Symfony v2.5 to travis
Merge remote-tracking branch 'sonata-project/master'

Conflicts:
	composer.json