fix Sensio FrameworkExtraBundle v3.0 ParamConverterInterface compatibiltiy
Merge pull request #259 from csanquer/1.4

fix Sensio FrameworkExtraBundle v3.0 ParamConverterInterface compatibility
revert addition of "conflict" to composer.json (not needed now that we are switching to 1.4)

Revert "Merge branch '1.2' into survos"

This reverts commit 62ca693235118b7bb345bde5a1db442c611d0226, reversing
changes made to a95b42c67ed7a5324ffaf379c66e55c9c9fd2996.
Merge branch '1.4' into survos