mail scheduling
Merge branch 'master' of github.com:yogendra-pant/online_quiz

Conflicts:
	pom.xml
	src/main/webapp/WEB-INF/SpringMVC-servlet.xml
Merge branch 'master' of github.com:yogendra-pant/online_quiz

Conflicts:
	pom.xml
	src/main/webapp/WEB-INF/SpringMVC-servlet.xml