70% coverage total.  min 50% coverage on each relevant Model/Controller.  testing is hard
merging with develop
Merge branch 'newjasmine' into develop

merge