Progress Commit

Implemented the skeleton for the carousel in the bottom nav
Merge branch 'bottom-nav-rev2' into dev
Merge branch 'dev'
Styles and updates
Merge branch 'dev'