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
Merge branch 'master' into android_production
version bump
ticket:54  not all work, bromlem vis center of map
ticket:54 map show all marker work
ticket:54 add highlite and sound whem new event
ticket:54 create fixture and fix bag
ticket:54 Updated Bootstrap
ticket:54 Merge branch 'master'
ticket:54 all fix
ticket:54 Merge branch 'master'