Added new migration to change event datetime from string back to datetime.
Merge remote-tracking branch 'origin/json-api' into fix-event
Added controller methods in EventsController and rspec tests.
Added check for current_user owning event before delete.
Fixed up create event to match request params.
Still fixing spec tests.
Merge remote-tracking branch 'origin/json-api' into fix-event

Conflicts:
	app/models/event.rb
	config/routes.rb
	db/schema.rb
	spec/controllers/events_controller_spec.rb
Fixed some conflicts. Rspec still doesn't work.
"Fixed bug in Event.rb"
Changed an attr_accessor var name in Event.rb
Fixed if statements in EventsController delete.
Set user_id to current_user.id in event create.
Fixing get_events return json.
Merge branch 'fix-event' of github.com:g0v/kuansim-rails into fix-event
fix json conversion
merged origin/fix-event
Merge remote-tracking branch 'origin/json-api' into fix-event

Conflicts:
	kuansim-frontend
hack fix for csrf (temporarily disabled csrf)
Merge branch 'fix-event' of github.com:g0v/kuansim-rails into fix-event
hack fix for csrf (temporarily disabled csrf)