Merge branch 'AndrewLee' into Dev

Conflicts:
	incommunit/Base.lproj/Main.storyboard
	incommunit/Convenience/LYconvenienceMain.m
	incommunit/Convenience/XIB/StoreslistTableViewCell.h
	incommunit/Convenience/XIB/StoreslistTableViewCell.m
	incommunit/Convenience/XIB/StoreslistTableViewCell.xib
	incommunit/CustomControls/HLineLabel.m