Merge remote-tracking branch 'upstream/master' into notification_framework
Merge remote-tracking branch 'upstream/master' into notification_framework
Merge remote-tracking branch 'upstream/master'
Improvements to teacher's view

In teacher's view it is now possible to move exercises to different
modules (in the same course instance), as well as, changing the order of
exercises in the module.
Merge pull request #140 from LassiHaaranen/master

Improvements to teacher's view. Move exercises between modules.