Views added
Replased views
Merge remote-tracking branch 'origin/master'