conflict fix #1

old masterbranch views.py restored