refactored collabserver
Merge branch 'Development' of https://github.com/societies/SOCIETIES-SCE-Services.git into Development