Allow nav bar buttons to be set with a barbuttonitem instead of a hash.
Merge branch 'multiple_nav_bar_buttons' into ir

* multiple_nav_bar_buttons:
  Allow nav bar buttons to be set with a barbuttonitem instead of a hash.