update
1、解决自定义视图TQImageContentView的AutoLayout尺寸计算时机问题
2、专题界面效果实现
123
123
update
Merge branch 'master' into ForSizeClass

Conflicts:
	Hiweido.xcodeproj/project.xcworkspace/xcuserdata/hly.xcuserdatad/UserInterfaceState.xcuserstate
	Pods/Pods-environment.h
	Pods/Pods.xcodeproj/project.pbxproj
	Pods/Pods.xcodeproj/xcuserdata/hly.xcuserdatad/xcschemes/Pods-AFNetworking.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/hly.xcuserdatad/xcschemes/Pods-MMProgressHUD.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/hly.xcuserdatad/xcschemes/Pods-NSLogger.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/hly.xcuserdatad/xcschemes/Pods-SDWebImage.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/hly.xcuserdatad/xcschemes/Pods-UIColor-Hex.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/hly.xcuserdatad/xcschemes/Pods-UIImage+ImageWithColor.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/hly.xcuserdatad/xcschemes/Pods-pop.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/hly.xcuserdatad/xcschemes/Pods.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/hly.xcuserdatad/xcschemes/xcschememanagement.plist
merge init