changes to ui for edf
fixed location merge conflict
Merge branch 'master' of https://github.com/blacksmithgu/northwind.git