Merging uploaded converters
Merge branch 'master' of github.com:caelum/vraptor