changed actionbaractivity to activity
Merged with master
modified insession for tutor and added tutor receipt
Merge remote-tracking branch 'origin/JoyDev3' into StevenDev