addde
Merge branch 'master' of https://github.com/sebink/forjenkins

Conflicts:
	AppiaCampAnalysis.rb