bugs fixed
Merge branch 'master' of https://github.com/khushbu14/webportal

Conflicts:
	webapp/views.py