config update
Merge branch 'EDMdev' of github.com:ETHZ/ASCore into EDMdev