Sorting by category, category paginator.
Merge remote-tracking branch 'origin/AfterMerge' into AfterMerge

Conflicts:
	web-store-persistent/src/main/resources/META-INF/persistence.xml
	web-store-webapp/src/main/webapp/resources/js/showGoodInfo.js
	web-store-webapp/src/main/webapp/tobuy.html
Corrected some stuff