Hid batch edit button, as there's a bug which should be fixed before this is deployed
Merge branch 'release-0.8.1'
Merge branch 'master' into release-0.8.2