Merge branch 'master' into t24_users_resource
Merge branch 'master' into t24_users_resource
ticket:24 Added Facebook credentials. Refactored settings
ticket:24 Configured python-social-auth
ticket:26 Added login/logout urls
ticket:24 Added PyYAML to requirements
ticket:24 Added additional permissions
ticket:24 Added permissions to api calls
ticket:24 Added additional permission check to map view
ticket:31 fix send emails
ticket:31 don't try to send email if we have no recipients
ticket:31 combine two alert message into one; small cleanup
Merge branch 't31_send_emails_bug'
ticket:40 Merge branch 'master' into t40_vibration_on_alarm_start

Conflicts:
	p2psafety-android/p2psafety/AndroidManifest.xml
	p2psafety-android/p2psafety/src/ua/p2psafety/sms/MessageResolver.java