Use less bandwidth to search disciplines :D
Fix colspan on the last cell of the table of selected disciplines
Merge branch 'hotfix/0.4.1' into develop