update views.py
update model and views.py
Merge branch 'tmp'