Update for new Xcode deprecations.
Remove a double declare that the new compiler didn't like.
Remove reference to Sidebar
Merge branch 'refs/heads/master' into develop

* refs/heads/master:
  Remove reference to Sidebar
  Remove a double declare that the new compiler didn't like.
  Update for new Xcode deprecations.