Edit design
Epic edition
Merge branch 'hike'
Add CBV
Merge branch 'design'