update from CocoaChina20140613

update from CocoaChina20140613