merge fix
fixed auto aggregating new workouts
fixed user fixtures
Merge branch 'refs/heads/06-addDataUsingMethod'