Merge branch 'master' of github.com:caelum/vraptor into testExcludeAll
Merge branch 'testExcludeAll' of github.com:ricardo-lino/vraptor into testExcludeAll