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
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