list disciplines
Merge branch 'master' into bruno
madalits
Merge branch 'bruno'