Merge project fixes and iOS UI fixes to master

@morganpackard 
- Fixes project settings so it builds in latest xcode
- Fix the UI for the iOS demo so the nav bars look right