production URL and FB app id
Merge branch 'android_development' into android_production
version bump
Merge branch 'android_development' into android_production
version up
Merge branch 'android_development' into android_production
version up
fixed SERVER_URL
Merge branch 'master' into android_production

Conflicts:
	p2psafety-android/p2psafety/AndroidManifest.xml
version up
ticket:51 Removed python-social-auth, added django-allauth
ticket:31 Fixed facebook login
ticket:51 Fixed tests
ticket:51 Added django-bootstrap3
ticket:51 Added login/signin templates
ticket:31 Removed logout confirmation step
ticket:51 Added Profile model
ticket:51 Added django-phone-field
ticket:51 Added phone field to Profile model
ticket:51 Configured django-allauth settings. Added custom signup form