Selector now takes into account group filtering again.
Merge pull request #1424 from jaypoulz/fire

Selector now takes into account group filtering again.
Merging in my own conflicts
Removed Name Units and Type from the Fields table header when there are no items in the set
Merge pull request #1429 from umin18/yc1426

Issue #1426
Merge remote-tracking branch 'upstream/master' into jp413
Testing migration
Testing migration up and down