fix controller errors due to definition model changes
Merge branch 'dev' of https://github.com/anthonycorradi/binview into dev
Merge branch 'dev' into model