adding wtp
Merge branch '1.1' of ssh://jreimann@gerrit.intra:29418/org.openscada.builder.git into 1.1

Conflicts:
	builder_global/openSCADALocal.target