bugfix
Merge branch 'Eric' of https://github.com/es059/Mobile-Anwendungen.git
into Eric

Conflicts:
	WorkoutLog/src/com/workout/log/HelperActivity.java