Added CPA code, CISDataCollector (these are yet not fully complete), fixed versioning in all my project files.
Also fixed ActivityFeed session handling.

Squashed commit of the following:

commit 7e872ac3a9e0b81a4d665547c805474d91a3b8c9
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Wed Aug 29 09:31:29 2012 +0200

    fixing CPA tests

commit 27048e87feb9f77c202149ba719289eaa85b9ec2
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Tue Aug 28 16:24:06 2012 +0200

    fixed cismanager tests

commit 8ccea93ad3bdf9689cc955783cccf620f6af7425
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Mon Aug 27 21:52:52 2012 +0200

    cleaning up and fixing session handling.

commit 2e19033cad239444ea92c28a89b99c563d0af794
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Tue Aug 21 15:05:48 2012 +0200

    changed pom versions

commit 4933bf24c304d8590e1fe0a9046deb1cb4eb3e7e
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Tue Aug 21 09:16:18 2012 +0200

    fixed cis simulator

commit f52afd8ffa7fa3049489bbc6d87e7e606e6ef635
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Thu Aug 9 18:25:18 2012 +0200

    starting implementation of datacollector

commit 4bf473ec240f240eaef0b631b128a747610301a1
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Thu Aug 9 13:02:24 2012 +0200

    propagated CIS/Actfeed changes into CPA

commit c00ac0726621c471b793a8e4b609ed1ad1298ec6
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Wed Aug 8 16:32:16 2012 +0200

    cleaning up activityfeed and propragating the activityfeed api change

commit d739e709ff8e883fbdf6f9b9d2c5944e6aeed45e
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Wed Aug 8 10:19:19 2012 +0200

    cleaned up activityfeed code, added back the API javadoc

commit 1cf4a4c3efa89dcd7573fff925cdd52f271a5317
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Tue Aug 7 09:09:08 2012 +0200

    starting merging datacollector

commit 2022e0817d7b1257369071a6895fef669eff10da
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Wed Jul 18 09:36:16 2012 +0200

    added activityfeed dependency as CISmanager no longer embeds transitive, this is the correct way anyway

commit a2836b9bb4dfb02a3d2aeffebd495c3a2d843556
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Tue Jul 17 14:24:57 2012 +0200

    fixed actfeed tests and moved juntest

commit 797f80a6ef78712699e4549909f394a1594ac708
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Tue Jul 17 10:59:49 2012 +0200

    added comparators

commit 1d61eb2d41f5ec4fb943faf12966aecdb0958699
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Tue Jul 17 10:59:04 2012 +0200

    working on the CIS simulator

commit 3592578fe8be328bcabc2db3400a8d35d101acd6
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Mon Jul 16 15:35:38 2012 +0200

    added context loader for main method, and context files

commit bbcb2e6c02d84e0c205f7cc434a4e0c485a23774
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Mon Jul 16 14:46:52 2012 +0200

    persisted activity, is slower, setting up a test with multiple threads..

commit 1293265de0b5f91c9a0e4f5316f4565ab549ac9b
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Mon Jul 16 09:47:41 2012 +0200

    simulator testing, discovered that actfeed only handeled 500k activities

commit 95406fc06a36875d8f231d18b03a4feda29abaad
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Wed Jul 11 08:29:34 2012 +0200

    commit before rebase

commit fab5c07a0c013e1a5d9cc9cf8aab6cc855cb3a55
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Tue Jul 10 09:44:54 2012 +0200

    working on the simulator
Merge branch 'development' of local repository into Olivier_CreateCis_GUI2
Update privacyPolicy Creation GUI