Merge branch 'paddy_preferences' into development
Added first iteration for VCard support
Added connection call before use
Added test container for testing VCard retrieval
Added helper for new VCard methods on Comms
Edits to display vcard avatar image
Added testing for null avatar
retrieve vcard for display
Merge branch 'Enterprise_Pilot_1.0' into VCard_alec
Fixed bug on disconnecting from service
Merge branch 'Enterprise_Pilot_1.0' into VCard_alec

Conflicts:
	android/client-frwk/SocietiesAndroidApp/assets/www/javascript/pagespecific/login.js
Added avatar image to the friend profile page
copied privacy assessment GUI from old webapp
removed '+' at beginnings of lines from diff output
Creating Radio and Checkbox popups to go along with the AckNack popup
Refactor Trust Broker API to support Indirect Trust Evaluation (#1676)
Temp fix to create communities to return successfully
Edits to start the privacy service (wasn't starting)
Changes to display suggested friends with SNS filter
remove concurrency issue