modyfy plist and xcode.project
modify
fix conflics
modify js-bindings
fix 2 bugs
modify to jsb-cpp.
modify conflicts.