Merge master into dev and vertically align the text of the serverstatus to the image