Refactored Comparator
Merge origin/master

Conflicts:
	src/fctc/controle/memoria/MemoriaPendenteDAO.java