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

Conflicts:
	p2psafety-android/p2psafety/AndroidManifest.xml
version up
ticket:47 Merge branch 'master' into production
ticket:47, 42 Merge branch 'master' into production
ticket:00 Merge branch 'master' into production
ticket:51 Removed python-social-auth, added django-allauth
ticket:31 Fixed facebook login
ticket:51 Fixed tests
ticket:51 Added django-bootstrap3