model syn-modified, add.ctp conflict-modified
uses_modified
空白modified
for rebase
ユーザー別にjoin,edit,deleteリンクを追加
modified space etc
Merge branch 'feature/auth_event_each' into develop

Conflicts:
	app/Controller/EventsController.php
	app/View/Events/add.ctp