Signed-off-by: paranoid <paranoid@paranoidQ>
Merge branch 'master' of git@github.com:bingluo/nauty.git


Signed-off-by: paranoid <paranoid@paranoidQ>
Merge branch 'master' of git@github.com:bingluo/nauty.git

Conflicts:
	src/CATEGORY_SqlMap.xml
	src/cn/seu/cose/dao/CategoryDAO.java
	src/cn/seu/cose/dao/CategoryDAOImpl.java
	src/cn/seu/cose/service/CategoryService.java
	web-app/WEB-INF/classes/CATEGORY_SqlMap.xml
Merge branch 'master' of git@github.com:bingluo/nauty.git

Conflicts:
	src/ARTICLE_SqlMap.xml
	web-app/WEB-INF/classes/ARTICLE_SqlMap.xml