Merge branch 'master' of https://github.com/hertus/sfitixi

Conflicts:
	src/Tixi/ApiBundle/Form/VehicleType.php