Merge pull request #12 from zhangfanba/master

加密解密demo和文档OK
Merge pull request #6 from One-Platform/master

update master
修改配置文件
Merge branch 'master' of https://github.com/shmilbin1570/example

Conflicts:
	showcase/src/main/resources/spring/applicationContext.xml
Merge applicationContext.xml
增加Webservice测试用例
Merge pull request #13 from zhangfanba/master

加密解密：解决form提交时，获取不到textarea值的问题
Merge pull request #7 from One-Platform/master

update master
Merge pull request #14 from zhangfanba/master

加密解密bug修改：form提交时，增加对textarea标签加密的支撑
Merge pull request #15 from zhangfanba/master

showcase样式调整，增加header，footer；分类明确
Merge pull request #8 from One-Platform/master

update master
增加WebService帮助文档
Merge pull request #16 from zhangfanba/master

文档与代码同步：form加密支持textarea标签
增加WebServiceController
该修showcase_webservice.jsp链接
增加showcase_webservice.jsp链接
Merge pull request #17 from shmilbin1570/master

增加Webservice的帮助文档及链接
Merge pull request #5 from One-Platform/master

从ONE上pull下来最新的工程