Merge branch 'Dev' into AndrewLee
微调界面
Merge branch 'Dev' into AndrewLee

Conflicts:
	incommunit/Base.lproj/Main.storyboard
	incommunit/Convenience/LYProductinformation.m
修改原价标签
Merge branch 'Dev' into AndrewLee
修改错误代码
修改‘公告详情’引用类
修改界面的一些显示bug
Merge branch 'Dev' into AndrewLee

Conflicts:
	incommunit/Base.lproj/Main.storyboard
	incommunit/Convenience/LYconvenienceMain.m
	incommunit/Convenience/XIB/StoreslistTableViewCell.m
	incommunit/CustomControls/HLineLabel.m
修改bug
界面微调
一些修改
Merge branch 'Dev' into AndrewLee

Conflicts:
	incommunit/Base.lproj/Main.storyboard
	incommunit/Convenience/LYProductinformation.m
	incommunit/Convenience/LYconvenienceMain.m
	incommunit/Convenience/XIB/StoreslistTableViewCell.m
	incommunit/Convenience/XIB/StoreslistTableViewCell.xib
	incommunit/CustomControls/HLineLabel.m
	incommunit/PropertyManagement/LYAnnDetails.m
购物车 商品选中修改
Merge branch 'Dev' into AndrewLee
购物车 更改数据修改
Merge branch 'AndrewLee' into Dev

Conflicts:
	incommunit/Convenience/LYShoppingcart.m