Server Module loading bits for #15 plugin system
Fixing merge conflicts
Merge branch 'rodms10-plugins' into development