started jenkins deployment job to cloudcontrol
Merge branch 'master' of github.com:prinzmajus/thmcards

Conflicts:
	puppet/files/jenkins/thmcards.deploy.config.xml