Gave up on PrimeFaces push - just using a simple poller to check for privacy policy negotiation events
Finished the actions and conditions in the request
Trivial Changes (formatting, etc)
Merge branch 'development' into paddy_preferences
refactored for ActivityFeed changes, added license header and some clean
ups
fixed occasional loss of attributes in pubsub payload serialization
Had to disable push temporarily
Disabling some of meiyii's stuff until we can sort out the conflicts in the JS
Merge branch 'paddy_preferences' into Enterprise_Pilot_1.0
Merge branch 'Enterprise_Pilot_1.0' of https://github.com/societies/SOCIETIES-Platform into Enterprise_Pilot_1.0
manual merging for privacy pref splitting and notifications
implementation for task 1969
Merge branch 'Enterprise_Pilot_1.0' into LiamTicket1969
after PPN, if item not sensed, add acc ctrl pref - with junit test
Move some Privacy Utility Methods and Fix Equals Methods
Fixed for dependency conflict on linux
removed location timeout when active
Fix doConnect after some changes in the connectors. The new process does't use any more external URLs
Add Scribe source because with the MVN include the scribe library wasn't
included. If is it possible please tell me how, and I will remove the
code for the right dependency.
Merge branch 'Luca_Android_SNS_DoConnect_FIX' into Enterprise_Pilot_1.0
Merge branch 'Olivier_UpdatePrivacyUtils' into eliza_enterpriseMerge

Conflicts:
	api/java/external/src/main/java/org/societies/api/identity/util/RequestorUtils.java
	api/java/external/src/main/java/org/societies/api/privacytrust/privacy/util/privacypolicy/ActionUtils.java
	api/java/external/src/main/java/org/societies/api/privacytrust/privacy/util/privacypolicy/ConditionUtils.java
	api/java/external/src/main/java/org/societies/api/privacytrust/privacy/util/privacypolicy/RequestItemUtils.java
	api/java/external/src/main/java/org/societies/api/privacytrust/privacy/util/privacypolicy/ResourceUtils.java
	api/java/external/src/main/java/org/societies/api/privacytrust/privacy/util/privacypolicy/ResponseItemUtils.java