1.2.5shenhe no pack
1.2.6forcheck
for ugly words 1.2.7
1.2.9for check
1.2.10jubao
1.2.11 final
Merge branch '1.2beforecheck'

Conflicts:
	aiyou-iphone.xcodeproj/project.pbxproj
	aiyou-iphone.xcworkspace/xcuserdata/dongjiawei.xcuserdatad/UserInterfaceState.xcuserstate
	aiyou-iphone.xcworkspace/xcuserdata/dongjiawei.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	aiyou-iphone/ArticleContentViewController.m
	aiyou-iphone/BindPhoneViewController.xib
	aiyou-iphone/DJWAppDelegate.m
	aiyou-iphone/PackSlideViewController.m
	aiyou-iphone/PackTableViewController.m
	aiyou-iphone/aiyou-iphone-Info.plist

end 1.2; continue 1.3