fix user controller
Merge remote-tracking branch 'origin/master' into Kevin
update controller test
changed prerequisite to course_id and related app logic | added user_id as instructor for courses
Merge remote-tracking branch 'origin/Develop/Bill' into Kevin
Update interfaces
Merge remote-tracking branch 'origin/Develop/Bill' into Kevin
Merge remote-tracking branch 'origin/Kevin'