change demo
Merge branch 'container-move-2' into container-ruixue
change demo
V5 changes
huan-v5
Merge remote-tracking branch 'origin/huan-v5'
bug fix
FB friends stored as Text

Signed-off-by: fei <1450622282@qq.com>
mainPage popup panel

Signed-off-by: fei <1450622282@qq.com>
Merge remote-tracking branch 'origin/fei-login'
Remove user info servlet extraneous info
master configured

Signed-off-by: fei <1450622282@qq.com>
Smoothing user login experience
Merge remote-tracking branch 'origin/fei-login'
friend list login update

Signed-off-by: fei <1450622282@qq.com>
Bug fix, ui tweeks
Merge remote-tracking branch 'origin/fei-login'
Friend list servlet
Bug fix - friendslist
bug fix