Merge pull request #2 from cocos2d/develop

merge develop new
add facebook mdify
modify code getUidClick
Merge pull request #819 from jianglong0156/developNew

Develop new