Fixed manage-whitelist table not displaying in IE
Merge remote-tracking branch 'origin/devel-whitelist-context' into devel
changed order of fields in whitelist import/export form
Merge branch 'devel-whitelist-context' into devel
Merge branch 'devel' into staging