Stream select box, network connectivity check
merge error correction
commit before pull
Merge branch 'master' of https://github.com/priyasaini/aakash_app

Conflicts:
	rhosimulator/WebpageIcons.db
	rhosimulator/rholog.txt_pos
connectivity, 2-step registration, student rgistration
Merge branch 'master' of https://github.com/priyasaini/aakash_app

Conflicts:
	rhoconfig.txt.changes
	rhosimulator/WebpageIcons.db
	rhosimulator/db/syncdblocal.sqlite
	rhosimulator/rholog.txt_pos
	rhosimulator/rhosimconfig.txt