fixed bug in label for add_course and add_lservice
Merge branch 'master' into holis_test-2
Merge remote-tracking branch 'origin/holis_test' into holis_test-2