Fixed profile settings controller so that trees are not duplicated
Removed duplication of code
Tests surrounding Profile Settings Page
Uncommented section of a test
Merge branch 'development' into paddy_webapp

Conflicts:
	platform-infrastructure/web-app/src/main/webapp/includes/loginbox.xhtml
Merge branch 'paddy_preferences' into development
Updating PrimeFaces theme so that it is consistent with the rest of the webapp
Updated login box to use new primefaces dialog
Updating primefaces theme
Creating a showcase page to ensure all the components are covered
Updating primefaces theme
Creating a showcase page to ensure all the components are covered
copied privacy assessment GUI from old webapp
removed '+' at beginnings of lines from diff output
Refactor Trust Broker API to support Indirect Trust Evaluation (#1676)
- Remove local binder and have only remote in SocietiesAndroidContext
service.
- Add xml for build/testing all AndroidContext in SocietiesLibraries.
- Change connection with commMgr.
- Add start stop service methods in ContextBrokerBase.
- Change containers test to connect with jane@societies.local.
- Remove unnecessary imports in ContextBrokerBase.
- Remove mock client communication mgr.
- Add SocietiesAndroidContext service in SocietiesAndroidApp
AndroidManifest.xml
- Change xmpperror exception in receiveError to .getApplicationError()
for callback of Context Android Service.
- Add unimplemented method in start stop methods
(SocietiesAndroidContext)
- Rename package of SocietiesAndroidContext client. 
- Change the use of Binder in the ContainerSocietiesAndroidContext.
- Remove unnecessary imports in the ContainerSocietiesAndroidContext.
- Change device automatically used from the pom in the
ContainerSocietiesAndroidContext.
- Add exception in the testCreateEntity
(TestSocietiesAndroidContextTest)
- add test calculation (TestSocietiesAndroidContextTest)
- use cloudNode in createEntity when sending stanza
Merge branch 'paddy_preferences' into paddy_webapp

Conflicts:
	platform-infrastructure/web-app/src/main/webapp/includes/loginbox.xhtml
Merge branch 'Enterprise_Pilot_1.0' into paddy_webapp
fixed minor logging error
temporal non working migration of privacy assessment GUI
Fix bug in trust update event publishing
Add test cases to BIT #1962 based on updated Trust Broker API
Remove obsolete remote trust interfaces