基本功能完成
Merge branch 'master' of github.com:lizzyphy/watermark_mfc

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