start server and fe demo
Merge branches 'master' and 'hhy'