Merge branch 'master' of https://github.com/rajgauravworld/scholarspoint.git/