Update CSS/CIS Context Monitor to handle CIS deletion events
Update BIT #1858 to test access control on CIS context data
Add test properties file to BIT #1678
Create IS_ADMIN_OF context association to model the CISs the user is
admin of
Update IS_ADMIN_OF context association based on CIS creation/removal
events
Use ServiceUtils to handle SVC TrustedEntityId generation
Add TrustValueFormat to format trust Double values as user-friendly
Strings
Apply Virgo improvements on intext Context Broker
Fix potential NPE in CtxAccessController.obfuscate method
adding changes from last week's rollback
Fix BIT #861
Merge remote-tracking branch 'origin/development' into paddy_userfeedback_mods

Conflicts:
	api/java/external/src/main/java/org/societies/api/context/model/CtxAssociationTypes.java
	api/java/external/src/main/java/org/societies/api/privacytrust/trust/model/util/TrustedEntityIdFactory.java
	context-management/ContextBroker/src/main/java/org/societies/context/broker/impl/security/CtxAccessController.java
	platform-infrastructure/web-app/src/main/java/org/societies/webapp/controller/privacy/prefs/PrivacyPreferencesController.java
	platform-infrastructure/web-app/src/main/webapp/privacypreferences.xhtml
	privacy-trust/java/privacy-protection/privacy-negotiation-management/src/main/java/org/societies/privacytrust/privacyprotection/privacynegotiation/comms/PrivacyNegotiationManagerCommClient.java
	privacy-trust/java/trust/trust-cloud-bundle/src/main/java/org/societies/privacytrust/trust/impl/evidence/monitor/CtxTrustEvidenceMonitor.java
Updated to latest version of Selenium - most notable change is the lack of many thousands of unnecessary System.err statements (which weren't actually errors)
Finished test #2116 - Automated testing of CIS join via the T65 webapp (although the actual 'join' page isn't complete yet, so this is simulated via the ICisManager, and the test only tests the UserFeedback GUI components)