1
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/bcc/uag/so/core/Usuario.java
Criada a classe bcc.uag.so.gui.TelaLogin