cleanup

Conflicts:
	iphone/iphone/Titanium.xcodeproj/project.pbxproj