Merge pull request #460 from interstroom/master

Add Symfony v2.5 to travis
Added php 5.6 to .travis.yml
use the new tab feature from the admin bundle
fix regression