main view cell+db change
Merge remote-tracking branch 'origin/master'

Conflicts:
	YY/Base.lproj/LaunchScreen.xib