Merge branch 'hotfix/fix_make_up_3'

* hotfix/fix_make_up_3:
  fix make up n events
Merge branch 'release/1.8.2.2'

* release/1.8.2.2:
  fix redirect after update report
  remove .swk files
  edit gitignore
Merge branch 'release/1.8.2.3'

* release/1.8.2.3:
  fix redirect after update report
Merge branch 'release/1.8.2.4'

* release/1.8.2.4:
  fix redirect on report form
Merge branch 'release/1.8.2.5'

* release/1.8.2.5:
  fix redirect on report form

Conflicts:
	app/controllers/participant/event/reports_controller.rb
Merge branch 'release/1.8.2.6'

* release/1.8.2.6:
  edit redirec
Merge branch 'release/1.8.2.7'

* release/1.8.2.7:
  Edit locales
Merge branch 'release/1.8.2.8'

* release/1.8.2.8:
  fix routing
  edit test
add table of participants
add locales
Merge branch 'hotfix/fix_make_up_of_event_participants' into develop

* hotfix/fix_make_up_of_event_participants:
  add locales
  add table of participants