update org venue and events tables
Merge branch 'master' of https://github.com/AmyLiNow/CultureAPT

Conflicts:
	app/controllers/events_controller.rb
	app/views/events/_form.html.erb
	app/views/events/index.html.erb
	app/views/events/index.json.jbuilder
	app/views/events/show.html.erb
	app/views/events/show.json.jbuilder
	db/schema.rb
	test/controllers/events_controller_test.rb
	test/fixtures/events.yml
fix conflicts in schema
re-updated the data tables