merge server and app directiry .
Merge branch 'master' of github.com:guanghetv/enterprise