Intermediate file calculations
Merge branch 'master' of https://github.com/jdischler/DSS_Server
Merge branch 'master' of https://github.com/jdischler/DSS_Server
Merge branch 'master' of https://github.com/jdischler/DSS_Server
A lot of changes

Bad news for the Friday the 13th???  Eeek