Merge branch 'master' of https://github.com/kayurra/struuts

Conflicts:
struuts/WebContent/strutstest001.jsp