fix warning
Merge branch 'master' of https://github.com/davidwyt/vehicleapp

Conflicts:
	VehicleIMServer/.classpath