some changes in views and models
Merge remote-tracking branch 'origin/master'
some changes in views and models