Merge pull request #170 from interstroom/master

Add Symfony v2.5 to travis
Added php 5.6 to .travis.yml
add option to hide container block types
fix tests
id can be a string e.g. in case of cmf
Merge pull request #175 from phiamo/fix-error-id

id can be a string e.g. in case of cmf