m
Merge branch 'master' of git@github.com:bingluo/nauty.git

Conflicts:
	src/ARTICLE_SqlMap.xml
	web-app/WEB-INF/classes/ARTICLE_SqlMap.xml
	web-app/WEB-INF/resin.conf
。
a
Merge branch 'master' of git@github.com:bingluo/nauty.git