Signed-off-by: ritacc <ritacc@126.com>
Merge branch 'master' of github.com:Jitlee/LPS

Conflicts:
	0_trunk/LPS/LPS.Web/Base/DictronaryEdit.aspx.designer.cs

Signed-off-by: ritacc <ritacc@126.com>