modyfy plist and xcode.project
modify
fix conflics
fix 2 bugs