Revert 42faa7d..3d012b7

This rolls back to commit 42faa7d5e3ef3965dec4e242bc127896e9c5d599.
Revert "Revert 42faa7d..3d012b7"

This reverts commit 417338c9e29d0a8c186e035a822bfad46081e694.
Revert "Merge branch 'master' of https://github.com/AmyLiNow/CultureAPT"

This reverts commit 3d012b720a5530f3e060b954c1f32bdc382168f3, reversing
changes made to 21948929773c82f96ce9aaedcbbf58df234fc3e3.
Revert "Merge branch 'master' of https://github.com/AmyLiNow/CultureAPT"

This reverts commit 3d012b720a5530f3e060b954c1f32bdc382168f3, reversing
changes made to 21948929773c82f96ce9aaedcbbf58df234fc3e3.

Conflicts:
	Gemfile
	app/controllers/events_controller.rb
	config/routes.rb