Added search field to events table
More searches
Improved searches
Updated site
Merge branch 'master' of https://github.com/AmyLiNow/CultureAPT

Conflicts:
	Gemfile
	app/controllers/events_controller.rb
	app/models/event.rb
	app/models/org.rb
	config/routes.rb
	db/development.sqlite3