Merge branch 'bs-dsc-648-uat'
Merge branch 'master' of github.com:nla/banjo
Merge branch 'master' of github.com:nla/banjo
DSC-610 problem with 'check' button in firefox is fixed
DSC-607 software & device can be blank now
Merge pull request #644 from nla/bs-dsc-607-software

Bs dsc 607 software