Merge origin/master

Conflicts:
	src/java/classes/data/EstacionamentoData.java
	src/java/classes/data/VeiculosData.java
	src/java/classes/transacoes/Modelos.java
	src/java/classes/transacoes/Veiculos.java
Merge origin/master
Merge origin/master