modify to build the env by jgd
Merge branch 'master' of https://github.com/sc703bupt/JSSWW-BUPT-For-Amazon-Hackathon

Conflicts:
	OpenCVTest/Morphology.h
	OpenCVTest/OpenCVTest.cpp
	OpenCVTest/OpenCVTest.vcxproj
	OpenCVTest/OpenCVTest.vcxproj.filters
	OpenCVTest/Pyramids.h
	OpenCVTest/Sift.h
	OpenCVTest/Smoothing.h
	OpenCVTest/Threshold.h