Fix TODO DisciplineListActivity
Merge branch 'master' of https://github.com/veniltonjr/msplearning.git