Merge pull request #1678 from suryanarayanakb/dev-branch

"Analytics in progress"
Unit setup to assignment navigation issue resolved.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1679 from mitraj/dev-branch

Unit setup to assignment navigation issue resolved.
Analytics conflicts resolved
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
analytics issues resolved
Merge pull request #1680 from ssushma/dev-branch

Analytics conflicts resolved
aanalytics issues resolved
Merge pull request #1681 from ssushma/dev-branch

aanalytics issues resolved
"added js for charts"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch