added more filters options to choices_controller
Merge branch 'master' of gitlab.com:participa/pairwise-api