try to fix pull operation problem
Merge branch 'master' of https://github.com/China-SPE-T-2013-Group1/Face-Verification-System

Conflicts:
	Debug/.NETFramework,Version=v4.0.AssemblyAttributes.obj
	Debug/AssemblyInfo.obj
	Debug/CL.read.1.tlog
	Debug/CL.write.1.tlog
	Debug/Face-Verification-System.exe
	Debug/Face-Verification-System.log
	Debug/Face-Verification-System.obj
	Debug/Face-Verification-System.pch
	Debug/Face-Verification-System.pdb
	Debug/cl.command.1.tlog
	Debug/stdafx.obj
	Debug/vc100.pdb
	Face-Verification-System.sdf
	Face-Verification-System.suo