Merge branch 'master' of https://github.com/code-scouts/code_scouts_platform into events
Merge branch 'events' of https://github.com/code-scouts/code_scouts_platform into events
Upgraded Django to 1.5, all tests pass. Updating requirements.txt.
s/CalendarView/calendar_view/
events/calendar.html: don't hardcode the calendar ID.
Use settings.CS_GOOGLE_CALENDAR instead.
events.tests.test_views: use reverse() instead of hardcoding the path to view

but we're still using a namespace defined in the project-level urls, so I'm not
entirely sure this is better. app_name might hold the key, but we couldn't
figure that out.
test_view: invoke view directly instead of using the test client
Merge pull request #2 from code-scouts/events

Events: Show a Google Calendar
Merge remote-tracking branch 'origin/upgrade'
merged resources forward to master