Adding SafeModelView
Merge branch 'master' into submissions