Move dfm to a submodule
Merge branch 'master' into CVproxy