Adding a View
Merge branch 'develop'