views.py
  Fixed bugs
Merge branch 'OPS2' of https://github.com/kpurdon/OPS into OPS2