updated composer.json
Merge branch 'sonata/master'
Merge branch 'sonata/master'
Added PHP 5.4 and 5.5 to .travis.yml
Merge pull request #79 from pulzarraider/patch-1

Added PHP 5.4 and 5.5 to .travis.yml
Merge branch 'sonata/master'
Merge branch 'origin/master'