renamed bundle to Rmzamora/CalendarBundle
Merge remote-tracking branch 'refs/remotes/origin/2.1'