t
Merge branch 'master' of https://github.com/luobin23628/GameMaster

Conflicts:
	imem.xcodeproj/project.pbxproj
	imemDaemon/Package/Applications/imem.app/Info.plist
	imemDaemon/Package/Applications/imem.app/imem
	imemDaemon/Package/Library/MobileSubstrate/DynamicLibraries/imemTweak.dylib
	imemDaemon/Package/usr/bin/imemDaemon