Offer Course layout changes
Fix tutor activity transtion bug
Merge remote-tracking branch 'origin/JoyDev3' into StevenDev