Merge branch 'shiksha-2.0' of github.com:tekdi/shiksha-frontend into …

Merge branch 'shiksha-2.0' of github.com:tekdi/shiksha-frontend into … #223