User feedback and UAM android updates
updates
Merge branch 'development' into sarah_android_useragent
Modified POMs to use APKLIB form of Android API
merge with branch and update POMs
updates
additional mocked methods added
updates
Temporarily removed reference to SocietiesUtilities
Merge branch 'development' into sarah_android_useragent
Merge branch 'development' of https://github.com/societies/SOCIETIES-Platform.git into development
Allow Android Agent to connect to openfire via an IP address.
Merge branch 'EdgarAndroidComms' into development
Firt implementation of performance test. The commit contains the OSGi
bundle (lower and upper tester) and the skeleton for the PHP symfony2
project
cardinality 1.1 set on PrivacyDataManager reference inside the CIS
bundle
Aggregated commit from bjornbranch, including getting 'n' activities from activityfeed, added functionality to CPA/Task5.1, also updated copyright. ANNIE plugins added for testability, may have to move this out of repo later.

Squashed commit of the following:

commit 91b101b48f8ebac5a27934d696e2abc9a3ba0b31
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Wed Dec 19 14:53:37 2012 +0100

    updated copyright

commit fcfa33118d299acfada786a2c9c94d74c453d1a3
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Wed Dec 19 14:21:47 2012 +0100

    build files for BITs

commit fea2b3f14c2a7764b8d8272fbb9cb61351b01692
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Wed Dec 19 14:11:34 2012 +0100

    this 'fix' seems to break IEventMgr, so unfixing it

commit ff58b2ff2b6f33e07c8aeb0e83adcf347b698956
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Mon Dec 17 09:56:00 2012 +0100

    new simulator now working with reuters data

commit 840c7530276ae87f6836fcd120c456a79d37416a
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Fri Dec 14 14:59:58 2012 +0100

    adding libs and testing new input data

commit 1a6f7df31bca3f98ef624e381843a0bacfafedfe
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Fri Dec 14 12:40:36 2012 +0100

    trying to integrate CPA, gate-core not fully osgi compliant

commit 7f0fc2664e70865c98cfd2ed14472d35940ce0c9
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Sat Dec 8 19:16:40 2012 +0100

    working on the new data input

commit 14544a86a6f4ae8f66760d81118b3cfa9a3500d0
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Fri Dec 7 09:23:33 2012 +0100

    annie semantic extractor comparator implemented and integrated, now testing

commit 57c3978abe84a28a3d6a07939208ed279d16d7b6
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Wed Dec 5 10:05:46 2012 +0100

    adding annie extractor to CPA

commit f84d68e3371e9802287eb369ca61faf0057ff0d8
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Mon Dec 3 14:14:08 2012 +0100

    updating my BIT to include new functionality of CPA

commit 9d71db926b73dcc6c762426167aab62882d4ed35
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Fri Nov 23 04:40:36 2012 +0100

    refactoring fix

commit e0954f2db296628b466e20cec5e2c1f24fb62459
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Mon Nov 19 08:43:46 2012 +0100

    refactoring fixes

commit 42c3d56aa5db0ea94b2ddfa9cc0a6d2327138874
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Fri Nov 16 10:53:42 2012 +0100

    refactoring commits

commit 39572023280c736bd255644b2147ea9405fefb88
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Sun Nov 11 11:46:07 2012 +0100

    trend spotting works, trend demo works

commit 9e321ac8e9650aadabcabfbd09429ca129cecdc7
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Tue Nov 6 11:20:45 2012 +0100

    worked out how to colour a trending node

commit 0f9e8e877e4225896a631ea18ab33a5a726a3dac
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Sun Nov 4 17:08:31 2012 +0100

    implementing and testing annie, starting work on trend visualization

commit d3f8facc8bde4b87f3cba8a44a177d4c0e3e5f5a
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Thu Oct 11 09:44:08 2012 +0200

    added gate dep

commit c03cb6574c771c5a505a147d4f6198975faa3e5f
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Tue Oct 9 20:18:15 2012 +0200

    more refactoring done

commit 7a88d57056fa4601425c4504f19e4d152f39b209
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Tue Oct 9 15:52:39 2012 +0200

    refactored schema for activityfeed, build does not work yet so will wait for fix until merge

commit 69085d344220c0a86942dddc0e4ba020bcbcd42b
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Tue Oct 9 08:21:58 2012 +0200

    fixed getting n acts

commit a752bea7d5fed1bc85cde4678d0bedfd8fa7f5ed
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Mon Oct 8 18:25:18 2012 +0200

    trying out msn data for testing

commit a319ac72cdfa3fcecce6ffca44688a5a75bdf065
Author: Bjørn Magnus Mathisen <bjornmagnus.mathisen@sintef.no>
Date:   Sun Oct 7 13:52:02 2012 +0200

    started importing csv dataset
correct typecast in case of FAILED_NEGOTIATION_EVENT
Merge branch 'development' of https://github.com/societies/SOCIETIES-Platform into development
strange fix even though i'm not using JPA this seems to be needed to get it to compile
Merge branch 'development' of github.com:societies/SOCIETIES-Platform into development