Merge origin/master

Conflicts:
	class/Util.class.php
	class/VeiculoAction.class.php
	index.php