new from asus
Merge remote-tracking branch 'origin/master'

Conflicts:
	SimpleServlet2/src/org/glassfish/ServletPage.java