完成商品的排序功能，界面没完成
merge
Merge branch 'master' of https://github.com/huangtao800/comparePrice.git

Conflicts:
	comparePrice/WebContent/WEB-INF/web.xml
	comparePrice/WebContent/commodityList.jsp
	comparePrice/WebContent/homepage.jsp
	comparePrice/WebContent/login.jsp
	comparePrice/WebContent/notLogonBar.jsp
	comparePrice/WebContent/register.jsp
	comparePrice/WebContent/userBar.jsp
	comparePrice/src/edu/nju/comparePrice/actions/UserBarAction.java
	comparePrice/src/edu/nju/comparePrice/attackDetector/Block.java
	comparePrice/src/edu/nju/comparePrice/attackDetector/Free.java
	comparePrice/src/edu/nju/comparePrice/attackDetector/Writer.java
	comparePrice/src/edu/nju/comparePrice/filters/AccessFilter.java
	comparePrice/src/edu/nju/comparePrice/models/BaseUser.java
	comparePrice/src/edu/nju/comparePrice/models/User.java
	comparePrice/src/edu/nju/comparePrice/services/UserService.java
	comparePrice/src/log.txt
	comparePrice/src/struts.xml