fixed some rubocop errors
fixed merge conflict
Merge pull request #211 from koelncampus/a-matter-of-style

fixed some rubocop errors
fixed overloocked issues

- syntax errors
- dublicate entry issues during testin, because EventTypes where not
  empied as they should
Merge remote-tracking branch 'origin/master' into sendeplanung

Conflicts:
	app/controllers/application_controller.rb