Change on Laptop
Merge remote-tracking branch 'origin/master'

Conflicts:
	sample-git/src/de/thinkenterprise/NewFeature.java