added framework adding to xcode project files
fix merge