1
Merge branch 'master' of git@github.com:weinianjie/web1.git

Conflicts:
	conf/ibatis-config.xml
	src/com/santrong/test/Test1.java
1