- Xcode has changed warnings and thus "treat errors as warnings" will cause compile errors. Since this is a 3rd party library we will let them fix the warnings on master and then pull them in later
Merge branch '20140307-op' into 20140204-federated-android

* 20140307-op:
  - Xcode has changed warnings and thus "treat errors as warnings" will cause compile errors. Since this is a 3rd party library we will let them fix the warnings on master and then pull them in later