Merge branch 'master' of git@github.com:herrshi/TGIS-Viewer-v3.4.git

Conflicts:
	workerswfs/workers/SocketWorker.swf