updated url of tomcat plugin
Merged master fixed conflict.