Merge branch 'feature/152_facetbrowser_multiple_choice' into develop