Properties
IMG
IMG
IMG
IMG
Merge branch 'master' of http://github.com/globaltec/ws

Conflicts:
	com.globaltec.fleetcontrol/webapps/fleetcontrol.war