ppp
Merge branch 'master' of https://github.com/icylydia/zhaohua

Conflicts:
	ArtSearching.xcworkspace/xcshareddata/ArtSearching.xccheckout
	ArtSearching/renren/LCYRenrenViewController.m
Merge branch 'master' of https://github.com/icylydia/zhaohua
df
df
Merge branch 'master' of https://github.com/icylydia/zhaohua

Conflicts:
	ArtSearching.xcodeproj/project.pbxproj
Merge pull request #10 from ChinaPicture/master

1211312313