Cloud4e 0.5.x

merge server from FAU