ticket:26 Added django-annoying to requirements
ticket:26 Added base template & map view
ticket:26 Added Google API key
ticket:26 Made page display Google map
ticket:26 Moved tests to separate folder
ticket:26 Added static_media dir to .gitignore
ticket:26 Added EventUpdate related name
ticket:26 Added tests for list retrieve
ticket:26 Added list retrieve for Event model
ticket:26 Refactored tests
ticket:26 Added EventUpdate api for list retrieve
ticket:26 Added key AngularJS elements
ticket:26 Removed old typo
ticket:26 Added default ordering
ticket:26 Implemented event map page
ticket:26 Implemented live-update
ticket:26 Added sample data generator command
ticket:26 Fixed timestamp generation
ticket:26 Improved memory management, moved map controls to the right
Merge branch 'master' into t26_event_map

Conflicts:
	.gitignore
	p2psafety_django/events/tests.py
	p2psafety_django/requirements.txt