added subjects functionality for role 2
Merge remote-tracking branch 'download/master'