subscriber to student
Merge branch 'master' of https://github.com/priyasaini/aakash_app

Conflicts:
	rhosimulator/WebpageIcons.db
	rhosimulator/db/syncdblocal.sqlite