Removed non-useful include.
Fixed warning.
Fixed Xcode 4.6 compatibility
Merge remote-tracking branch 'upstream/master' into message-preview-in-examples

Conflicts:
	example/ios/iOS UI Test/iOS UI Test/en.lproj/MainStoryboard.storyboard