testedis
Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/private/private.xml
Merge branch 'master' of https://github.com/schwii/Badenfahrt

c4dac5128a3ae5d53.

Conflicts:
	nbproject/private/private.xml

Conflicts:
	nbproject/private/private.xml