Merge branch 'AndrewLee' into Dev

Conflicts:
	incommunit/Base.lproj/Main.storyboard
	incommunit/Convenience/LYShop.m
	incommunit/Convenience/XIB/StoreslistTableViewCell.xib