suggested friends webpage
updating suggested friends page and friends page
commented out poll from main_template to prevent 5 sec updates on pages,
added image and other suggested friends updates
Merge branch 'LiamWebapp' into development and
resolve conflict in applicationContext.xml
Merge branch 'development' of https://liammar1@github.com/societies/SOCIETIES-Platform.git into development