Merge branch 'dev' into View
no message
Merge branch 'View' of https://github.com/anthonycorradi/binview into View