Merge pull request #10 from GloriaPG/staging

Fixed tomcat
Merge pull request #11 from GloriaPG/staging

Delete
Merge pull request #12 from GloriaPG/staging

Staging
xxx
Merge branch 'master' of github.com:GloriaPG/jenkins-test into staging