changes
Merge branch 'origin/master'
Merge branch 'origin/master'

Conflicts:
	src/com/satya/Servlets/AdminUserServlet.java