Normalize line endings
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Added updating of simple hash db config panel
Merge pull request #382 from rcordovano/develop-rc1

Added updating of simple hash db config panel
Corrected handling of always calc hashes flag
Merge pull request #384 from rcordovano/develop-rc1

Corrected handling of always calc hashes flag
Fixed npe while getting data source name for local files.
Merge pull request #385 from jawallace/develop-rc1-logical-file-fix

Fixed npe while getting data source name for local files.
Fix for scheduling of derived files
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop-rc1' into merge_in_develop-rc1
Merge pull request #386 from rcordovano/merge_in_develop-rc1

Merge in develop rc1