added some views
Merge branch 'views'
merging views
added views