copied from Core-Social Branch
fixed aggregator pom
Merge remote-tracking branch 'origin/master' into Social
Merge remote-tracking branch 'origin/master' into Social
Merge branch 'mc1_8' into Social
ported the social prototype