XSSFilter changes - allow multiple reads from a request
add common-io
Merge branch 'developer-lisa' into container-ruixue

Conflicts:
	src/org/smg/server/filter/XSSRequestWrapper.java
ESAPI test
ESAPI double encoding validation
fb g+ friend list

Signed-off-by: fei <1450622282@qq.com>
configured for master

Signed-off-by: fei <1450622282@qq.com>
Merge remote-tracking branch 'origin/fei-login'
i18n

Signed-off-by: owwlo <owwlo@163.com>
i18n patch for fb

Signed-off-by: owwlo <owwlo@163.com>
Spacing change
admin servelet
'hi' problem

Signed-off-by: owwlo <owwlo@163.com>
Merge branch 'master' of https://github.com/lisajluo/smg-server into container-move-2
Merge branch 'huan-v5' of https://github.com/lisajluo/smg-server into huan-v5
GetAllUser
Merge branch 'huan-v5' of https://github.com/lisajluo/smg-server into huan-v5
filter field
Merge branch 'huan-v5' of https://github.com/lisajluo/smg-server into huan-v5
modification