Merge pull request #1050 from nutan-gooru/dev-branch

Implemented Need to show end time and end page + have error message i…
fixed grade issue
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch