fix #240
Merge branch 'master' into statistics

Conflicts:
	Isengard/Gemfile
	Isengard/app/controllers/events_controller.rb
	Isengard/db/schema.rb
Merge pull request #246 from ZeusWPI/statistics

fix #240