Just pulling from repository after a couple of minor changes (My response to GIT asking "Please enter a commit message to explain why this merge is necessary, especially if it merges an updated upstream into a topic branch."

WB-873 Splash Screen - Changed order of file types and allow user to collapse/expand each file type.

make CaretPointer short circuit when redundantly grabbing NULL, parallelize warpfield convention conversion

match ROI behavior between metric and volume dilate, make minimum kernel size independent of dilation distance

WB-872 Crash in identification when file contains parcels (except pconn file): Since logic for PCONN identification is very unique it remains unchanged.  Logic for identification parcels prior to "WB-865 Asymmetric conn identification shows wrong values" has been restored and used for other types of parcel files.

Fixed crash that occurred when help resources were excluded and a specific help page was requested by name and not through the help dialog (link on Annotation Mode warning dialog).

Added cached cmake variable WORKBENCH_INCLUDE_HELP_HTML_RESOURCES in src/CMakeLists.txt.  When TRUE (the default) the html help information is included.  When FALSE, the help resources are excluded and selection of help results in a message indicating help is not available.

Fixed compilation warnings resulting from additional compiler options including testing for missing breaks in switch statements.

Fixed compilation error on Debian.  There was a switch statement on an enumerated type that was missing one of the enumerated values.  The purpose of the switch statement was for compilation to fail if a new coordinate space enumerated value was added to indicate, via comments, new widget(s) may be needed (none of the 'case' statements did anything).  Even though we have the compiler options on to treat a missing case warning as an error, our compilers did not do this in this one instance.  Apparently, the switch statement was ignored since it did nothing and the variable in the switch was 'const' and initialized to a value.  Removing the 'const' resulted in a compiler error for the missing case 'SPACER' that has been added.

Resolve WB-871 Allow editing of a palette's color bar font color:  The font color is editable via selection of the color bar in Annotate Mode.  Font color is saved to scenes.

Fixed bug with window space color bars always being drawn.  If in single tab mode (Tile Tabs OFF), color bars from other tabs were being drawn if the color bar was in window space.