bla
Merge branch 'master' of https://github.com/eicke123/comfit

Conflicts:
	comfit/src/de/comfit/SportActivity.java
	comfit/src/de/comfit/sport/PushUpActiv.java
Merge branch 'master' of https://github.com/eicke123/comfit

Conflicts:
	comfit/res/values/strings.xml
	comfit/src/de/comfit/GraphActivity.java
	comfit/src/de/comfit/history/WorkoutData.java
	comfit/src/de/comfit/history/WorkoutHistory.java
	comfit/src/de/comfit/history/WorkoutItem.java
merge