Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/zhimeng/loupanguanli/dao/LouPanDAO.java