Timer für im workout nimmt gestalt an
timer läuft
test
Merge remote-tracking branch 'origin/Database'

Conflicts:
	WorkoutRoutineApp/AndroidManifest.xml
	WorkoutRoutineApp/bin/AndroidManifest.xml
	WorkoutRoutineApp/bin/WorkoutRoutineApp.apk
	WorkoutRoutineApp/bin/classes.dex
	WorkoutRoutineApp/bin/resources.ap_
	WorkoutRoutineApp/src/de/martinswoboda/workoutroutineapp/MainActivity.java
	WorkoutRoutineApp/src/de/martinswoboda/workoutroutineapp/RoutineActivity.java
Changed adapters and database operations
Method GetSetExercises in DatabaseHandler isn't working perperly and i
haven't the slightest idea why
Removed Actionbar
here are the buttons
even more buttons
a few things
back buttons are working
all buttons are clickable
create wokrout activity is there
a few new things
changes for creating and changing routines