user management complete
commit message
commit message
livetracking integration
Merge remote-tracking branch 'origin/vedu_and_varu' into HimanshuArora

Conflicts:
	main/dbHelper.py
	main/webUi/page2Templates/appButton.html
livetracking integration