Changes in the DSP converter due to new versions of xml2js and relying on apps/formulator.html
Merge branch 'develop'
Remaining issue with merge, file should have been deleted not copied ...
Merge branch 'master' into develop