Merge remote-tracking branch 'origin/master'

Conflicts:
	ROOT/src/com/jshop/dao/GoodsCategoryTDao.java
Merge remote-tracking branch 'origin/master'