update from CocoaChina20140611

update from CocoaChina20140611