Merge branch 'AndrewLee' into Dev

Conflicts:
	incommunit/Convenience/LYconvenienceMain.m
	incommunit/Convenience/XIB/StoreslistTableViewCell.m
	incommunit/CustomControls/HLineLabel.m
	incommunit/PropertyManagement/LYAnnDetails.m