Formatting for provisioning details

make minor changes to definition view model to enable better formatting
Fixing conflicts in various views, merge

Merging with masterLayout
Merge branch 'dev' of https://github.com/anthonycorradi/binview into dev