Fixed calendar.html.erb
Merge branch 'master' of https://github.com/hyoli/project