Merge pull request #5 from ChinaPicture/master

ttt
icy
Merge pull request #6 from duostec/master

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

Conflicts:
	ArtSearching.xcworkspace/xcshareddata/ArtSearching.xccheckout
	ArtSearching/renren/LCYRenrenViewController.m