Change Server API names
Merge branch 'develop' of git://github.com/Pixel418/Staq into develop