the local first change.
Merge branch 'master' of github.com:jipan/testStruts1
modified change