Total changes today by Jeet upto 12 noon
Final changes by Jeet till 1pm
Merge branch '12june' into register-login

Conflicts:
	templates/webapp/contributor_signup.html
	templates/webapp/index.html~
	webapp/forms.py
	webapp/forms.pyc
	webapp/forms.py~
	webapp/models.pyc
	webapp/urls.pyc
	webapp/views.py
	webapp/views.pyc
	webapp/views.py~
	webportal/settings.pyc
	webportal/urls.py
	webportal/urls.pyc
	webportal/urls.py~
Deleted 'media' directory.
Merge pull request #6 from jeet23/register-login

Register login