improve(multiple-choice) Allow grouped choices
Merge branch 'master' of https://github.com/undf/ExtraFormBundle