set default
Merge commit '42c0e66f67370470725cb3e56f23c5e17a2c64e6'

Conflicts:
	comfit/src/de/comfit/ClickSportActiv.java