Merge branch 'Dev' into AndrewLee

Conflicts:
	incommunit/Convenience/XIB/LY_DeliveryCell.m
	incommunit/Convenience/XIB/SubmitOrderItemView.m