Model
Merge remote-tracking branch 'origin/master'

Conflicts:
	Web/src/main/java/br/com/banav/model/Usuario.java