Merge branch 'AndrewLee' into Dev

Conflicts:
incommunit.xcodeproj/project.pbxproj
incommunit/Base.lproj/Main.storyboard
Merge branch 'Dev' of https://github.com/Langyist/LYCommunit into Dev

Conflicts:
	incommunit.xcodeproj/project.pbxproj
	incommunit/Base.lproj/Main.storyboard