new branch
Admin-draft
facebook login added

Signed-off-by: fei <1450622282@qq.com>
admin
admin login prototype

Signed-off-by: owwlo <owwlo@163.com>
Merge branch 'huan-v4' of https://github.com/lisajluo/smg-server into huan-v4

Conflicts:
	src/org/smg/server/servlet/admin/adminConstants.java
code update
adminCensor is working now

Signed-off-by: owwlo <owwlo@163.com>
facebook userinfo url bug fixed

Signed-off-by: fei <1450622282@qq.com>
facebook userinfo url bug fixed2

Signed-off-by: fei <1450622282@qq.com>
add block button for new game

Signed-off-by: owwlo <owwlo@163.com>
facebook master configured

Signed-off-by: fei <1450622282@qq.com>
code fix
v4-from-huan
code fix
Merge remote-tracking branch 'origin/fei-login'
Merge remote-tracking branch 'origin/huan-v4'
Profile image upload changes