Merge branch 'master' of https://github.com/WatermelonMusic/BigWatermelon

Conflicts:

ASIHTTP/ASIHTTP.xcodeproj/project.xcworkspace/xcuserdata/ty.xcuserdatad/
UserInterfaceState.xcuserstate
	ASIHTTP/ASIHTTP/ggHttpFounction.h