changes in .pbxproj file (Base SDK) - master
try to merge .pbxproj file
changes in .pbxproj file (Generate profiling code Maybe) - master
Merge branch 'second'

Conflicts:
	CocoApp6-4.xcodeproj/project.pbxproj
Merge branch 'second'

Conflicts:
	CocoApp6-4.xcodeproj/project.pbxproj