Maven Tomcat Plugin #5. Add plugin.
Merge remote-tracking branch 'origin/master'