0.1 edition bug fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	system/Pixel0.1/Pixel0.1/removeDuplicatePatchs.cpp
	system/Pixel0.1/Pixel0.1/superImagePatch.h