fix for bug 2017
Merge branch 'Enterprise_Pilot_1.0' of https://liammar1@github.com/societies/SOCIETIES-Platform.git into Enterprise_Pilot_1.0
fix bug where the existing friends are no longer removed from the
suggested friends list in Android app
tidy up
Merge branch 'Enterprise_Pilot_1.0' of https://liammar1@github.com/societies/SOCIETIES-Platform.git into Enterprise_Pilot_1.0
Merge branch 'Enterprise_Pilot_1.0' into LiamTicket2017