fix wrong server class includes (closes #256)

+ remove evolution server
Forward Erfurt
Merge remote-tracking branch 'upstream/develop'

Fix #51.