Fixing the trips for iPad
Merge branch 'master'
Fixed the "Guest" text not appearing by adding a null check in the controller.
Merge pull request #29 from caseyvill/quick-fixes

Fixing the trips for iPad, fixed Guest Text. Yuriy confirmed iOS tests still passed.