Merge pull request #18 from nhattan/fix-user-courses

Change into trainee-courses
Improve activities