Modified some build settings.  It turns out that adding i386 does not let the release build work in all projects.  Your best bet is to lipo the release/debug .a files
Merge branch 'master' of https://github.com/freethinkaa/iOS-Rich-Text-Editor

Conflicts:
	RichTextEditor.xcodeproj/project.xcworkspace/xcuserdata/john.mcglone.xcuserdatad/UserInterfaceState.xcuserstate