Run stopX if $DISPLAY is set
Remove the additional space
Merge branch 'newStructure' of https://github.com/SimonEbner/jenkins_setup into newStructure
Merge branch 'newStructure' of https://github.com/SimonEbner/jenkins_setup into newStructure

Conflicts:
	scripts/pbuilder_env.sh