pre-merge
Merge branch 'master' of https://github.com/streppneumo/isp

Conflicts:
model/operons.py
resolve conflct