Merge remote-tracking branch 'origin/master'

Conflicts:
	SimpleServlet2/src/org/glassfish/ServletPage.java
Merge branch 'master' of https://github.com/min2das/SimpleServlet2.git