Refactored shuttles home screen data source to be a single section
Updated enums to use NS_ENUM macro
Merge branch '3.6/shuttles-home-refactor' into 3.6-dev