从数据库读取水印
判断水印是否合法
Merge branch 'master' of github.com:lizzyphy/watermark_mfc

Conflicts:
	test/RUN.bat
	test/stdafx.h
	test/testDlg.cpp
	test/testDlg.h