Fixed move course bug
Merge remote-tracking branch 'origin/nicholas' into dev