Merge origin/master

Conflicts:
	src/java/classes/data/VeiculosData.java