upgraded to rails4 #82
switched to secure params
Merge remote-tracking branch 'origin/master' into rails-4

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/broadcast_content.rb
	app/models/broadcast_format.rb
	config/routes.rb
	db/schema.rb
fixed route
fixed rails4 related tests
Veranstalltungs routes spec
Merge remote-tracking branch 'origin' into fix-routes
Merge branch 'master' into rails-4

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/broadcast_content_types_controller.rb
	app/controllers/broadcast_formats_controller.rb
	app/controllers/broadcast_slots_controller.rb
	app/controllers/broadcast_types_controller.rb
	app/controllers/events_controller.rb
	app/models/event.rb
fixed tests
Merge pull request #184 from koelncampus/fix-routes

Fix routes
Merge remote-tracking branch 'origin' into rails-4
fixes #201
fixes #202

its params.require instead of params.required
fixes #201
fixes #202
fixes #204
fixed comments
fixed merge conflicts
started to write simple controller specs
fixed typo and removed dead code