Server modularized
Merge branch 'master' of https://github.com/matteocontrini/xtrm-feedback
Merge branch 'master' of https://github.com/matteocontrini/xtrm-feedback