Added View class
Merge branch 'dev'