made the table drag and drop and added button and modal
Merged with master
Fixed DSC-302
Minor bug fix
Merge branch 'master' into dsc-302
Merge pull request #605 from nla/dsc-302

Dsc 302