ticket:25 Fix for setuptools version collision
ticket:25 Updated test to make event active after eventupdate
ticket:25 New eventupdate makes event active + some fixes
ticket:25 Changed older version of factory_boy due to setuptools version collision
ticket:25 Added test that show old events deletion mistake
ticket:25 Fixed old events finishinh mistake
ticket:25 Small fixes to clarify things
ticket:25 Merge branch 't25_events_resource'
ticket:23 settings change
ticket:23 small fix
ticket:23 Cleaned up a little
ticket:25 Added docstring for helper
ticket:23 just in case
ticket:23 small fix
ticket:23 Small fix
ticket:27 start SOS with Power button
ticket:27 minor app logic changes (cherry-picket from t6_SOS_api_request)
Merge branch 't27_sos_with_hardware_buttons'
android version up
Merge branch 'master' into t26_event_map

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