Events controller and basic actions
script/rails update
Merge branch 'calendar'
Created calendar
Merge branch 'calendar'