[WIP] Refactoring
Merge branch 'master2' into fix-model

Conflicts:
	spec/models/event_spec.rb
Refactoring event model
Use jbuilder instead of 'render :json'
Delete Guardfile
Merge branch 'master2' into fix-model

Conflicts:
	app/models/event.rb
Refactor events controller
Use sort_by instead of sort
Merge pull request #15 from shunsugai/fix-model

Refactoring