Merge branch 'develop' of github.com:ulmic/i_am_the_lider into develop

* 'develop' of github.com:ulmic/i_am_the_lider:
  fix redirect on report form

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

* release/1.8.2.6:
  edit redirec