Fixes for Symfony 2.6
Added Collapse bootstrap template
Merge remote-tracking branch 'origin/2.6'