Temporary fix for cis manager membership / location context attribute,
to ensure a working system for enterprise trials.
This need to be discussed between cis manager and context developers to
ensure that a prenament solution is found
Fix #1991: PrivacyPolicyUtils inferring methods were buggy in Android
and Virgo.
Clean up formatting of accept friend request form
Merge branch 'Enterprise_Pilot_1.0' of git@github.com:societies/SOCIETIES-Platform.git into Enterprise_Pilot_1.0
Removed debug logging statements
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

Conflicts:
	android/client-frwk/SocietiesAndroidApp/assets/www/javascript/pagespecific/login.js