merged
Merge branch 'master' of https://github.com/PraveshKoirala/IOESTS

Conflicts:
	ioests/ioests/__init__.pyc
	ioests/ioests/settings.pyc
	ioests/ioests/urls.pyc
	ioests/ioests/wsgi.pyc
	ioests/ioestu/__init__.pyc
	ioests/ioestu/admin.pyc
	ioests/ioestu/emailTemplates.pyc
	ioests/ioestu/endofday.pyc