applet inserted
Merge origin/master
applet updated
applet updated
Merge origin/master

Conflicts:
	src/java/asw1003/servlets/ManageOrderServlet.java
	src/java/asw1003/servlets/ShopServlet.java
	web/jsp/adminApplet.jsp