policy on create via XMPP
temp inegotiator
Merge branch 'development' into thomas-privacy
privacy added to join (though not working yet)
tested the create CIS with policy in XMPP and added support for
Requestor parameter on get list of members (plus get list of members on
CIsManager)
merged with current devel code
adding missing files
privacy check before sending list of members
Keep the old way to retrieve a CIS member list
Update CIS joining negotiation and access control
advertisement record corrected
CIS joining with negotiation should work (with the fix in privacy
negotiation available on development branch)
Merge remote-tracking branch 'origin/thomas-privacy' into thomas-privacy

Conflicts:
	cis-modules/cis-management/cis-manager/cis-manager/src/main/java/org/societies/cis/manager/CisManager.java
join is now privacy-aware
Merge branch 'thomas-privacy' of https://github.com/societies/SOCIETIES-Platform into thomas-privacy

Conflicts:
	cis-modules/cis-management/cis-manager/cis-manager/src/main/java/org/societies/cis/manager/CisManager.java
	platform-infrastructure/service-lifecycle/platform-webapp/src/main/java/org/societies/webapp/controller/CisManagerController.java
Merge branch 'thomas-privacy' into development

Conflicts:
	api/android/external/src/main/java/org/societies/android/api/cis/management/ICisManager.java
	api/android/external/src/main/java/org/societies/android/api/servicelifecycle/AServiceImplementation.java
	api/android/external/src/main/java/org/societies/android/api/servicelifecycle/AServiceResourceIdentifier.java
	api/android/external/src/main/java/org/societies/api/css/directory/ACssAdvertisementRecord.java
	api/android/internal/src/main/java/org/societies/android/api/internal/cssmanager/IAndroidCSSManager.java
	api/java/external/src/main/java/org/societies/api/context/model/CtxModelBeanTranslator.java
	api/java/external/src/main/java/org/societies/api/osgi/event/CssDCEvent.java
	api/java/internal/src/main/java/org/societies/api/internal/css/management/ICSSLocalManager.java
	api/java/internal/src/main/java/org/societies/api/internal/css/management/ICSSRemoteManager.java
	api/java/internal/src/main/java/org/societies/api/internal/useragent/model/FeedbackForm.java
	api/schema/external/src/main/resources/org.societies.api.schema.cis.manager.xsd
	api/schema/external/src/main/resources/org.societies.api.schema.context.contextmanagement.xsd
	api/schema/external/src/main/resources/org.societies.api.schema.css.cssmanagement.xsd
	cis-modules/cis-management/cis-manager/cis-manager/src/main/java/org/societies/cis/manager/Cis.java
	cis-modules/cis-management/cis-manager/cis-manager/src/main/java/org/societies/cis/manager/CisManager.java
	cis-modules/cis-management/cis-manager/cis-manager/src/main/resources/META-INF/spring/bundle-context-osgi.xml
	cis-modules/cis-management/cisMgmtTester/src/main/java/org/societies/cis/manager/tester/CisMgmtTester.java
	cis-modules/cis-management/cisMgmtTester/src/main/resources/META-INF/spring/bundle-context-osgi.xml
	context-management/CommunityContextEstimation/pom.xml
	context-management/CommunityContextInferenceManagement/src/main/java/org/societies/context/community/inference/impl/CommunityCtxInferenceMgr.java
	context-management/ContextBroker/src/main/java/org/societies/context/broker/impl/CtxBroker.java
	context-management/ContextBroker/src/main/java/org/societies/context/broker/impl/InternalCtxBroker.java
	context-management/ContextBroker/src/main/java/org/societies/context/broker/impl/comm/CtxBrokerClient.java
	context-management/ContextBroker/src/main/java/org/societies/context/broker/impl/comm/CtxBrokerCommCallback.java
	context-management/ContextBroker/src/main/java/org/societies/context/broker/impl/comm/CtxBrokerServer.java
	context-management/ContextBroker/src/main/java/org/societies/context/broker/impl/comm/ICtxCallback.java
	context-management/ContextBroker/src/main/java/org/societies/context/broker/impl/comm/callbacks/CreateAttributeCallback.java
	context-management/ContextBroker/src/main/java/org/societies/context/broker/impl/comm/callbacks/CreateEntityCallback.java
	context-management/ContextBroker/src/main/java/org/societies/context/broker/impl/comm/callbacks/LookupCallback.java
	context-management/ContextBroker/src/main/java/org/societies/context/broker/impl/comm/callbacks/RetrieveCtxCallback.java
	context-management/ContextBroker/src/main/java/org/societies/context/broker/impl/comm/callbacks/UpdateCtxCallback.java
	context-management/ContextBroker/src/test/java/org/societies/context/broker/test/BeanTranslatorTest.java
	context-management/ContextBroker/src/test/java/org/societies/context/broker/test/ExternalCtxBrokerTest.java
	context-management/LocationManagement/src/main/resources/META-INF/spring/bundle-context.xml
	context-management/UserContextSimilarityEvaluation/src/main/java/org/societies/context/user/similarity/impl/UserCtxSimilarityEvaluator.java
	context-management/api/src/main/java/org/societies/context/api/community/estimation/estimationModel.java
	css-modules/css-mgmt/cssCommsMgmt/src/main/java/org/societies/css/mgmt/comms/CommsClient.java
	css-modules/css-mgmt/cssCommsMgmt/src/main/java/org/societies/css/mgmt/comms/CommsServer.java
	css-modules/css-mgmt/cssmgmt/src/main/java/org/societies/css/mgmt/CSSManager.java
	css-modules/css-mgmt/cssmgmt/src/main/resources/META-INF/spring/bundle-context-osgi.xml
	css-modules/css-mgmt/cssmgmt/src/main/resources/META-INF/spring/bundle-context.xml
	css-modules/device-mgmt/HWUControllerDriver/pom.xml
	example/context-3pBroker-example/src/main/java/org/societies/context/example/externalBroker/ContextAware3pService.java
	example/context-3pBroker-example/src/main/java/org/societies/context/example/externalBroker/ExternalCtxBrokerExample.java
	example/context-broker-example/src/main/java/org/societies/context/example/broker/CtxBrokerExample.java
	example/context-broker-example/src/main/resources/META-INF/spring/bundle-context-osgi.xml
	example/context-broker-remote-example/src/main/java/org/societies/context/exampleRemote/broker/ContextAware3pService.java
	example/context-broker-remote-example/src/main/java/org/societies/context/exampleRemote/broker/CtxBrokerExampleRemote.java
	example/context-broker-remote-example/src/main/java/org/societies/context/exampleRemote/broker/IContextAware3pService.java
	example/context-broker-remote-example/src/main/resources/META-INF/spring/bundle-context-osgi.xml
	integration-tests/BIT/cis-test-suite/ico/automatically-delete-cis#1022/src/main/java/org/societies/integration/test/bit/automatically_delete_cis/IHelloWorld.java
	integration-tests/BIT/ico-test-suite/CSSDataCollector#1093/pom.xml
	intelligent-community-orchestration/CSM/pom.xml
	intelligent-community-orchestration/CSM/src/main/java/org/societies/orchestration/CSM/main/java/GroupIdentfier/GroupManager.java
	intelligent-community-orchestration/CSM/src/main/java/org/societies/orchestration/CSM/main/java/GroupIdentfier/IcoRecommendtionEvent.java
	intelligent-community-orchestration/CSM/src/main/java/org/societies/orchestration/CSM/main/java/GroupIdentfier/publishSuggestion.java
	intelligent-community-orchestration/CSM/src/main/java/org/societies/orchestration/CSM/main/java/Models/ModelManager.java
	intelligent-community-orchestration/CSM/src/main/java/org/societies/orchestration/CSM/main/java/csm/CSM.java
	intelligent-community-orchestration/CSM/src/test/java/org/societies/orchestration/CSM/test/CSMTest.java
	intelligent-community-orchestration/CSSDataCollector/pom.xml
	intelligent-community-orchestration/CSSDataCollector/src/main/java/org/societies/orchestration/CSSDataCollector/main/java/CssDCEvent.java
	intelligent-community-orchestration/CSSDataCollector/src/test/java/org/societies/orchestration/CSSDataCollector/test/CSSDataCollectorTest.java
	platform-infrastructure/client-frwk/SocietiesAndroidApp/AndroidManifest.xml
	platform-infrastructure/client-frwk/SocietiesAndroidApp/assets/www/html/communities_landing.html
	platform-infrastructure/client-frwk/SocietiesAndroidApp/assets/www/html/communities_result.html
	platform-infrastructure/client-frwk/SocietiesAndroidApp/assets/www/html/friends_landing.html
	platform-infrastructure/client-frwk/SocietiesAndroidApp/assets/www/html/settings.html
	platform-infrastructure/client-frwk/SocietiesAndroidApp/assets/www/javascript/pagespecific/cismanager.js
	platform-infrastructure/client-frwk/SocietiesAndroidApp/assets/www/javascript/pagespecific/communities_landing.js
	platform-infrastructure/client-frwk/SocietiesAndroidApp/assets/www/javascript/pagespecific/mainpage.js
	platform-infrastructure/client-frwk/SocietiesAndroidApp/assets/www/javascript/pagespecific/my_friends_list.js
	platform-infrastructure/client-frwk/SocietiesAndroidApp/assets/www/javascript/pagespecific/snsconnectors.js
	platform-infrastructure/client-frwk/SocietiesAndroidApp/assets/www/javascript/plugins/cismanager_plugin.js
	platform-infrastructure/client-frwk/SocietiesAndroidApp/assets/www/javascript/plugins/snsconnectors_plugin.js
	platform-infrastructure/client-frwk/SocietiesAndroidApp/assets/www/pluginjs/cismanager.js
	platform-infrastructure/client-frwk/SocietiesAndroidApp/assets/www/pluginjs/cssmanager.json
	platform-infrastructure/client-frwk/SocietiesAndroidApp/src/org/societies/android/platform/phongegap/PluginCISFunctions.java
	platform-infrastructure/client-frwk/SocietiesAndroidApp/src/org/societies/android/platform/phongegap/PluginCSSManager.java
	platform-infrastructure/client-frwk/SocietiesAndroidApp/src/org/societies/android/platform/phongegap/PluginSNConnector.java
	platform-infrastructure/client-frwk/SocietiesCISManager/AndroidManifest.xml
	platform-infrastructure/client-frwk/SocietiesCISManager/src/org/societies/android/platform/cis/CommunityManagement.java
	platform-infrastructure/client-frwk/SocietiesCSSManager/src/org/societies/android/platform/cssmanager/LocalCSSManagerService.java
	platform-infrastructure/client-frwk/TestAndroidAPIContainerTest/pom.xml
	platform-infrastructure/client-frwk/TestContainerCIS/src/org/societies/android/platform/cistester/TestActivityCIS.java
	platform-infrastructure/service-lifecycle/platform-webapp/pom.xml
	platform-infrastructure/service-lifecycle/platform-webapp/src/main/java/org/societies/webapp/controller/CisManagerController.java
	platform-infrastructure/service-lifecycle/platform-webapp/src/main/java/org/societies/webapp/controller/CssSuggestedFriendsController.java
	platform-infrastructure/service-lifecycle/platform-webapp/src/main/java/org/societies/webapp/controller/PrivacyPolicyController.java
	platform-infrastructure/service-lifecycle/platform-webapp/src/main/java/org/societies/webapp/controller/UserFeedbackController.java
	platform-infrastructure/service-lifecycle/platform-webapp/src/main/webapp/WEB-INF/applicationContext.xml
	platform-infrastructure/service-lifecycle/platform-webapp/src/main/webapp/WEB-INF/views/leftbar.jsp
	platform-infrastructure/service-lifecycle/platform-webapp/src/main/webapp/WEB-INF/views/privacy/privacy-policy/index.jsp
	platform-infrastructure/service-lifecycle/platform-webapp/src/main/webapp/WEB-INF/views/privacy/privacy-policy/show-3p-service.jsp
	platform-infrastructure/service-lifecycle/platform-webapp/src/main/webapp/WEB-INF/views/privacy/privacy-policy/show-cis.jsp
	platform-infrastructure/service-lifecycle/platform-webapp/src/main/webapp/WEB-INF/views/servicediscoveryresult.jsp
	platform-infrastructure/service-lifecycle/platform-webapp/src/main/webapp/css/style.css
	platform-infrastructure/service-lifecycle/platform-webapp/src/main/webapp/js/userfeedback/userfeedback.js
	privacy-trust/java/privacy-protection/assessment/pom.xml
	privacy-trust/java/privacy-protection/privacy-negotiation-management/src/main/java/org/societies/privacytrust/privacyprotection/privacynegotiation/PrivacyPolicyNegotiationManager.java
	privacy-trust/java/privacy-protection/privacy-negotiation-management/src/main/java/org/societies/privacytrust/privacyprotection/privacynegotiation/negotiation/client/NegotiationClient.java
	privacy-trust/java/privacy-protection/privacy-protection-bundle/pom.xml
	privacy-trust/java/privacy-protection/privacy-protection-bundle/src/main/resources/META-INF/spring/bundle-context-osgi.xml
	privacy-trust/java/privacy-protection/privacy-protection-bundle/src/main/resources/META-INF/spring/bundle-context.xml
	privacy-trust/java/privacy-trust-comm-manager/pom.xml
	privacy-trust/java/privacy-trust-comm-manager/src/main/java/org/societies/privacytrust/remote/privacynegotiationmanagement/PrivacyNegotiationManagerCommClient.java
	privacy-trust/java/privacy-trust-comm-manager/src/main/resources/META-INF/spring/bundle-context-osgi.xml
merge...
Merge branch 'development' of https://github.com/societies/SOCIETIES-Platform.git into development