Merge remote-tracking branch 'origin/master'

Conflicts:
	Desktop/src/main/java/br/com/banav/gui/Passagem.java