Merge branch 'AndrewLee' into Dev

Conflicts:
	incommunit/Convenience/LYconvenienceMain.m
	incommunit/Convenience/XIB/LY_DeliveryCell.m
	incommunit/LYFunctionInterface.h
	incommunit/LYFunctionInterface.m