Teacher LMS
Merge branch 'Gyansha/LMS_Teacher'

Conflicts:
	build.xml
	build/generated/classes/org/apache/jsp/Login_jsp.class
	build/generated/src/org/apache/jsp/Login_jsp.class.smap
	build/generated/src/org/apache/jsp/Login_jsp.java
	build/web/Assignment.jsp
	build/web/Login.jsp
	build/web/Logout.jsp
	build/web/Main.jsp
	build/web/css/grunion.css
	build/web/css/style1.css
	nbproject/ant-deploy.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/private/private.properties
	nbproject/private/private.xml
	nbproject/project.properties
	nbproject/project.xml
	web/META-INF/context.xml
	web/WEB-INF/web.xml
	web/css/grunion.css
	web/css/style1.css