added some rigid test conditions
bug fixing with studentLogic and more tests
Merge remote-tracking branch 'origin/master' into Issue1949
Merge remote-tracking branch 'origin/master' into Issue1949
change of comment
Merge remote-tracking branch 'origin/master' into Issue1949
Merge branch 'master' into Issue1949
[1949] Clean up StudentLogic

fixes #1949
Merge branch 'master' into bootstrap