updatet server to 51seven.de:8888
oO
Merge remote-tracking branch 'origin/master'