Update Struts
Update Doc
Merge remote-tracking branch 'origin/master' into Local