Merge origin/master

Conflicts:
	web/WEB-INF/web.xml
Merge origin/master

Conflicts:
	web/WEB-INF/web.xml
Merge origin/master

Conflicts:
	web/WEB-INF/web.xml
Merge origin/master

Conflicts:
	web/WEB-INF/web.xml
Merge origin/master

Conflicts:
	web/WEB-INF/web.xml
Merge origin/master

Conflicts:
	web/WEB-INF/web.xml
Merge origin/master

Conflicts:
	web/WEB-INF/web.xml
Merge origin/master

Conflicts:
	web/WEB-INF/web.xml
Merge origin/master

Conflicts:
	web/WEB-INF/web.xml
Merge origin/master

Conflicts:
	web/WEB-INF/web.xml
Merge origin/master

Conflicts:
	src/java/model/Message.java
	src/java/servlet/Pay2.java
	web/OrderDetail.jsp
	web/bankacc.jsp
	web/buylist.jsp
	web/css/menu.css
	web/selllist.jsp
	web/sidecat.jsp