New View
Merge remote-tracking branch 'origin/feature/first_view' into develop