added location setting for course
Merge branch 'felipeq-phase2' into phase2