revert some api
add cocos2dUIDesign project
fix Unmerged file