Deleting WPAlertViewSideBySide.xib.
Updated WordPress-iOS-Shared pod to 0.0.3
pod spec version now 0.1.5
Bugfix for missing placeholder text in textview
Updated to shared pod requirement 0.0.5; removed fonts from demo app (now using WPFontManager)
Merge pull request #72 from wordpress-mobile/feature/fonts

Shared pod update, now using WPFontManager
Bumped podspec version to 0.1.6
Removing failing that that isn't used
Adding Cocoa Lumberjack as a dependency to test otherwise tests fail.
Adding .travis.yml
Adding shared EditorDemo scheme so Travis will work.
Adding travis build status to README.md
Merge pull request #80 from wordpress-mobile/feature/add-travis-integration

Feature/add travis integration
License, now with more MIT.
Merge branch 'develop' of github.com:wordpress-mobile/WordPress-iOS-Editor into feature/quill

# By Matt Bumgardner (7) and Sendhil Panchadsaram (5)
# Via Matt Bumgardner (2) and Sendhil Panchadsaram (1)
* 'develop' of github.com:wordpress-mobile/WordPress-iOS-Editor:
  License, now with more MIT.
  Adding travis build status to README.md
  Adding shared EditorDemo scheme so Travis will work.
  Adding .travis.yml
  Adding Cocoa Lumberjack as a dependency to test otherwise tests fail.
  Removing failing that that isn't used
  Bumped podspec version to 0.1.6
  Updated to shared pod requirement 0.0.5; removed fonts from demo app (now using WPFontManager)
  Bugfix for missing placeholder text in textview
  pod spec version now 0.1.5
  Updated WordPress-iOS-Shared pod to 0.0.3
  Deleting WPAlertViewSideBySide.xib.

Conflicts:
	Classes/WPEditorViewController.m
	Example/Podfile.lock
	Example/Pods/Local Podspecs/WordPress-iOS-Editor.podspec
	Example/Pods/Manifest.lock
	Example/Pods/Pods-EditorDemo-environment.h
	Example/Pods/Pods-EditorDemo-resources.sh
	Example/Pods/Pods.xcodeproj/project.pbxproj
	WordPress-iOS-Editor.podspec