server: chages about_us
Merge branches 'server' and 'master'