events controller ready for form
Merge pull request #26 from JustAboutJeff/events_controller

events controller ready for form
Another merge conflict fixed