Merge origin/master

Conflicts:
	i3a-car/build.xml
	i3a-car/nbproject/build-impl.xml
	i3a-car/nbproject/genfiles.properties