first commit
Merge https://github.com/Aaronyoung1987/WhosUpForServer