fixed the build
Merge with upstream..
Merge branch 'Testing_Release_1.0' of github.com:societies/SOCIETIES-Platform into Testing_Release_1.0