Formatando com padrão do eclipse.

[Ricardo, Rezende]
Merge branch 'PatchDicionario' into Formatting
Links das nossa páginas e movendo código do WordController.

(#39)

[Rezende, Ricardo]
Merge branch 'master' into Formatting

Conflicts:
	src/main/java/br/usp/ime/cogroo/controller/DictionaryPatchController.java
Merge branch 'master' into InserindoPalavras

Conflicts:
	src/main/java/br/usp/ime/cogroo/controller/WordController.java
	src/main/webapp/WEB-INF/jsp/dictionaryPatch/derivations.jsp
	src/main/webapp/WEB-INF/jsp/dictionaryPatch/newEntry.jsp