some modification
Merge branch 'master' of https://github.com/davidwyt/vehicleapp

Conflicts:
	VehicleIMServer/src/com/vehicle/imserver/service/impl/FileTransmissionServiceImpl.java
mm
update UI