Merge branch 'master' of https://github.com/ruggeri-oliveira/struts.git