server updates
Merge branch 'master' of github.com:klamping/UIRegression