Fixing integration tests
Merge branch 'development' into SanchoSLMWork
Update remote obfuscation (not finished)
Merge branch 'development' of git@github.com:societies/SOCIETIES-Platform.git into development
Remove deprecated ICtxBroker.registerForUpdates method
Merge branch 'development' of git@github.com:societies/SOCIETIES-Platform.git into development
java doc updates on CtxAttribute types, including description of type
and possible value types
Added activity to support accepting friend requests
Dependency
Merge branch 'development' of https://github.com/societies/SOCIETIES-Platform.git into development
Merge branch 'development' into yboul_CCE_Location
remote comm ctx example updated
Merge branch 'development' of https://nikoskal@github.com/societies/SOCIETIES-Platform.git into development
Working on integration tests
Merge branch 'development' into SanchoSLMWork
Small changes to the  create cis test
Merge branch 'development' of https://RafikSM@github.com/societies/SOCIETIES-Platform.git into development
Various changes relevant to App service control and platform events
Merge branch 'development' of https://github.com/societies/SOCIETIES-Platform into development
Implemented and tested activityfeed as a service, tested with integration tests and unit tests. Webapp also seems to work.

Squashed commit of the following:

commit acee33a21f3137d0dbdc760c1bc3a40d2b8015bd
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Fri Feb 15 12:19:30 2013 +0100

    added persistance mapping

commit f62931898a1626a4859fc04522339f7eba703d26
Author: tcarlyle <tcarlyle@gmail.com>
Date:   Fri Feb 15 10:50:20 2013 +0100

    adding the criteria result to the arraylist to be sure that the feed
    list is modifiable

commit 71b5d587438b803ebb5bf805aaf035e4b16c59a2
Author: tcarlyle <tcarlyle@gmail.com>
Date:   Fri Feb 15 09:42:16 2013 +0100

    reference fixed, now we can start the platform

commit 1f3fc483dd5363ed8ef39d5816305f9b0bbf13cf
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Thu Feb 14 23:48:59 2013 +0100

    it builds now

commit a12b55ef85d656515d78f82bbcba89eae2954c5a
Author: tcarlyle <tcarlyle@gmail.com>
Date:   Thu Feb 14 18:21:11 2013 +0100

    CIS and CIS tests already build with new activity feed, but I cant
    yet start the platform

commit 9e6437db6731cf2fb02499959f8f97d1bf29db58
Author: tcarlyle <tcarlyle@gmail.com>
Date:   Thu Feb 14 14:58:33 2013 +0100

    a few changes, but not touching on the ActivityFeed client yet

commit cdeab12ee64bc35c96c9074c65268dcc07c68ffb
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Thu Feb 14 11:06:50 2013 +0100

    fixed tests

commit f0d12afc4ad1579d6e5dc9bcf1a0fdeecf35ece5
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Thu Feb 14 02:00:32 2013 +0100

    refactored cismanager, integration tests is TODO.

commit ddf706221ebc80e0bb10dc41b7f34d0f16a8bd42
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Wed Feb 13 21:06:12 2013 +0100

    checkpoint: AFManager unit tests runs with persistance

commit 7bc778f0da1cc0a10f73573ce3ea093ec33aa734
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Wed Feb 13 13:44:27 2013 +0100

    Test logic seems close to finished, going to merge activityfeed and persistentactivityfeed.

commit a785e9f59fdd0c349c383a07d2766dc4491c623d
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Wed Feb 13 03:11:42 2013 +0100

    started work on tests for the new activityfeedservice

commit 3de90db091e3359ef229f0b846b271c6c8e69b80
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Tue Feb 12 23:35:56 2013 +0100

    checkpoint

commit 8cd3c3c59c2f505e0b5087ab610d07cb3e88d977
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Tue Feb 12 21:41:38 2013 +0100

    checkpoint

commit e6c435fcf51a8cfc09962f5c47a162a8b6ea83b7
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Tue Feb 12 09:51:25 2013 +0100

    reverted changes to cis manager, also reverted changes to activityfeed library, keeping the service as a separate project

commit 5b70d2d4657f90f88f51d954b34cd0be30d9c419
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Tue Feb 12 09:40:32 2013 +0100

    checkpoint

commit f668c49e8fdecda4d984dc63764535b08a6f9d18
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Mon Feb 11 23:30:19 2013 +0100

    checkpoint

commit 8652fb5768fa23bc271a68691fcf6f0e03492bf4
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Mon Feb 11 20:43:58 2013 +0100

    checkpoint

commit 13a5d90e917ce45200e6f75665ea3c24e6c72756
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Mon Feb 11 00:15:05 2013 +0100

    checkpoint

commit 2e69211bc13d8b0b683783efc786e6091480f7f2
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Sun Feb 10 16:19:58 2013 +0100

    starting to convert activityfeed to service..