Checkbox erledigt
Merge branch 'developadnan' into rename
fixes dependency bugs in the process
deletes unwanted stuff (see below)

Conflicts:
	training/app/models/user.rb
	training/config/routes.rb
	training/db/schema.rb
	training/db/seeds.rb

	new file:   app/assets/javascripts/traininglist.js.coffee
	new file:   app/assets/stylesheets/traininglist.css.scss
	modified:   app/controllers/application_controller.rb
	new file:   app/controllers/exercises_controller.rb
	deleted:    app/controllers/home_controller.rb
	new file:   app/controllers/own_exercises_controller.rb
	new file:   app/controllers/traininglists_controller.rb
	deleted:    app/controllers/uebungs_controller.rb
	deleted:    app/controllers/useruebungs_controller.rb
	deleted:    app/controllers/workoutplans_controller.rb
	new file:   app/helpers/exercises_helper.rb
	deleted:    app/helpers/supports_helper.rb
	new file:   app/helpers/traininglist_helper.rb
	deleted:    app/helpers/uebungs_helper.rb
	deleted:    app/helpers/workoutplans_helper.rb
	new file:   app/models/exercise.rb
	new file:   app/models/exercise_traininglist.rb
	new file:   app/models/traininglist.rb
	deleted:    app/models/uebung.rb
	modified:   app/models/user.rb
	deleted:    app/models/user_uebung.rb
	renamed:    app/views/uebungs/_form.html.erb -> app/views/exercises/_form.html.erb
	new file:   app/views/exercises/edit.html.erb
	new file:   app/views/exercises/index.html.erb
	renamed:    app/views/uebungs/new.html.erb -> app/views/exercises/new.html.erb
	new file:   app/views/exercises/show.html.erb
	new file:   app/views/exercises/uebungen.html.erb
	deleted:    app/views/home/index.html.erb
	renamed:    app/views/workoutplans/edit.html.erb -> app/views/own_exercises/edit.html.erb
	new file:   app/views/own_exercises/index.html.erb
	new file:   app/views/own_exercises/new.html.erb
	new file:   app/views/partials/_trainingsliste.html.erb
	modified:   app/views/partials/_uebungsliste.html.erb
	new file:   app/views/partials/_uebungsliste_alle.html.erb
	new file:   app/views/traininglists/edit.html.erb
	new file:   app/views/traininglists/index.html.erb
	new file:   app/views/traininglists/new.html.erb
	new file:   app/views/traininglists/show.html.erb
	deleted:    app/views/uebungs/edit.html.erb
	deleted:    app/views/uebungs/index.html.erb
	deleted:    app/views/uebungs/index.json.jbuilder
	deleted:    app/views/uebungs/show.html.erb
	deleted:    app/views/uebungs/show.json.jbuilder
	deleted:    app/views/uebungs/uebungen.html.erb
	modified:   app/views/user_data/index.html.erb
	deleted:    app/views/workoutplans/excerciseconfiguration.html.erb
	deleted:    app/views/workoutplans/index.html.erb
	deleted:    app/views/workoutplans/new.html.erb
	modified:   config/routes.rb
	renamed:    db/migrate/20130815100624_create_uebungs.rb -> db/migrate/20130815100624_create_exercises.rb
	new file:   db/migrate/20130817170839_create_user_exercises.rb
	deleted:    db/migrate/20130817170839_create_user_uebungs.rb
	new file:   db/migrate/20130817174123_add_user_id_to_exercises.rb
	deleted:    db/migrate/20130817174123_add_user_id_to_uebungs.rb
	deleted:    db/migrate/20130818204319_add_auswaehlen_to_uebung.rb
	new file:   db/migrate/20130819081459_create_traininglists.rb
	new file:   db/migrate/20130819082613_exercise_traininglists.rb
	new file:   db/migrate/20130820092047_create_exercises_traininglists_join_table.rb
	new file:   db/migrate/20130820123414_add_user_id_to_traininglists.rb
	modified:   db/schema.rb
	modified:   db/seeds.rb
	deleted:    test/controllers/supports_controller_test.rb
	new file:   test/controllers/traininglist_controller_test.rb
	deleted:    test/controllers/uebungs_controller_test.rb
	deleted:    test/controllers/user_datas_controller_test.rb
	deleted:    test/controllers/workoutplans_controller_test.rb
	renamed:    test/fixtures/uebungs.yml -> test/fixtures/traininglists.yml
	deleted:    test/fixtures/user_uebungs.yml
	deleted:    test/helpers/supports_helper_test.rb
	new file:   test/helpers/traininglist_helper_test.rb
	deleted:    test/helpers/uebungs_helper_test.rb
	deleted:    test/helpers/user_datas_helper_test.rb
	deleted:    test/helpers/workoutplans_helper_test.rb
	renamed:    test/models/uebung_test.rb -> test/models/traininglist_test.rb
	deleted:    test/models/user_test.rb
	deleted:    test/models/user_uebung_test.rb