fixed bugs with sorting subjects
sorted TODO
Merge branch 'master' into develop