- Add local wrapper for SocietiesAndroidContext service. 
- Use expiring cache to cache entities, attributes, associations created
and retrieved objects.
- Use string of the identifier as a key in the expiring cache, instead
of the CtxIdentifierBean.
- Modify remove method to remove objects from the cache after
removing them from the cloud.
- Modify update method to update objects from the cache after updating
them in the cloud.
- Use ConcurrentHashMap instead of LinkedHashMap in the ExpiringCache.
update communityContextPrediction class
update UserContextInheritanceMgr and UserInheritance class and add junit
testing for the first one
specified timeout for personalization mgr
creation of caci model attribute removed from cis creation
removed duplicate files to resolve conflicts
Merge branch 'development' into ContextAndroid_Helper
Fix Direct Trust Engine bug: Ignore ratings for unknown entities
IComminfmanager exposes method for retrieving inferable communit
ctx attribute types, bug fix in comm inf manager, integration test
extended.
- Add CtxEntityTypes and CtxAssociationTypes in android API.
- Implement lookup method in ContextClientHelper that looks up using the
ctxEntitityIdentifier. 
- Implement retrieveIndividualEntityId method in ContextClientHelper. 
- Implement update method in ContextClientHelper.
- Add RETRIEVE_INDIVIDUAL_ENTITY_ID and UPDATE to the
ContextClientHelper Receiver and the Intent Filter of the
ContextClientHelper. 
- Add test for retrieving location and updating a ctxAttribute.
Merge branch 'development' into ContextAndroid_Helper
tidy up and unit test additions
Merge branch 'LiamWebappUpdate' into development
Fix BIT #1962
unit test stuff
Add Direct Trust Evaluation performance test (Fixes #2093)
Refactor ICtxBroker.lookup(Requestor, IIdentity, String) method (related
to #1717, #2086)

* External and internal ICtxBroker interface cleanup
Omit access control check from ICtxBroker.lookup methods (Closes #2087)
Add method to sort a list of data by their parent type