changed from hardcoded wrong paths, to relative correct ones
dropping bit 1096 CPA into pickup should now work with the fullcontainer virgo startup plan
merge with upstream Testing_Release_1.0
Merge branch 'Testing_Release_1.0' of github.com:societies/SOCIETIES-Platform into Testing_Release_1.0_CPA1096FIX
corrected api bundle dependencies
Merge branch 'Testing_Release_1.0_CPA1096FIX' into Testing_Release_1.0
Merge branch 'Testing_Release_1.0' of github.com:societies/SOCIETIES-Platform into Testing_Release_1.0
New performance test squeleton
added classpath addition to pubsub client in activityfeedservice startup
merge with upstream
Merge branch 'Testing_Release_1.0' of github.com:societies/SOCIETIES-Platform into Testing_Release_1.0
Merge with upstream.

Merge branch 'Testing_Release_1.0' of github.com:societies/SOCIETIES-Platform into Testing_Release_1.0
Resolved Content provider apk start problem
merge with upstream.

Merge branch 'Testing_Release_1.0' of github.com:societies/SOCIETIES-Platform into Testing_Release_1.0
removed simple from common lib and corrected simple converter pom
reverted dependency changes
removed embed transitive from ICO API module
Merge remote-tracking branch 'origin/TR1.0_api_dependency_cleanup' into Testing_Release_1.0
IAndroidUserFeedback interface changes
Added remote service info to the manifest
Bug fixes in friends service
jaxb2simple fix null string list bug