Merge pull request #1516 from jjettenn/master

Fix delete
fix js compile warning
display attr label instead of attr name, fix js compile warnings
fix data explorer filter dialog
Merge pull request #1517 from dennishendriksen/master

Various data explorer fixes
Remove deprecated code
Merge pull request #1518 from erwinwinder/master

Remove deprecated code
Categorical fields in forms
Merge pull request #1519 from erwinwinder/master

Categorical fields in forms
Ref fix