add conflict with SensioFrameworkExtraBundle >=2.4
Merge pull request #261 from havvg/1.2

add conflict with SensioFrameworkExtraBundle >=2.4
Merge branch '1.2' into survos