Merge kaos:galaxy-server to the galaxy-server branch

At this moment this branch is still experimental.