Update Android privacy Policy GUI
Update Android Privacy Policy GUI (sort)
Android Privacy Policy and Data Manager Services Are Now Started at the
First Binding, Stopped at the Last Unbnding.
Prepare Android PrivacyPolicyManager Cordova Plugin to Start Correctly
the Android Service
Merge branch 'Enterprise_Pilot_1.0' of
github.com:societies/SOCIETIES-Platform into Enterprise_Pilot_1.0

Conflicts:
	android/client-frwk/SocietiesAndroidApp/AndroidManifest.xml
	android/client-frwk/SocietiesAndroidApp/assets/www/javascript/pagespecific/privacypolicy_show.js
	android/client-frwk/SocietiesAndroidApp/src/org/societies/android/platform/phongegap/PrivacyPolicyManagerPlugin.java
	privacy-trust/android/privacy-trust/privacy-data-management/apklib/src/main/java/org/societies/android/privacytrust/policymanagement/service/PrivacyPolicyManagerLocalService.java
Fixed problem with Account and Formatted name displayed for each friend
Removed TOKEN value in tester
Added information about each friends: more than the ID like diplayName,
account, thumb.
Fixed bugs in Friends converters
add facebook prefix in the Person ID
Update Android PrivacyPolicyManager Cordova Plugin (service starting was
buggy)
Added content provider support for avatar hashes
Merge branch 'Enterprise_Pilot_1.0' of https://github.com/societies/SOCIETIES-Platform into Enterprise_Pilot_1.0
Add a catch for possible errors
Remove improper Import
removed stacktrace log
Fixes to unit test cases
Merge branch 'Enterprise_Pilot_1.0' of https://aleckey@github.com/societies/SOCIETIES-Platform.git into Enterprise_Pilot_1.0
Merge branch 'Enterprise_Pilot_1.0' into VCard_alec
Attempts to write vcard to disk