Trying to fix git error
Merge branch 'master' of https://github.com/MCE-KobyBo/libimobiledevice

Conflicts:
	common/userpref.c
	libimobiledevice.vcxproj
	libimobiledevice.vcxproj.filters