Merge branch 'hotfix/0.4.1'
Merge branch 'release/0.5.0'
Some fixes to do a best search in discipline combobox
Fix bug when removing discipline from the list of selected disciplines
Merge branch 'hotfix/0.5.1' into develop