removed jetty dependency of whack from build and cleaned some overrides of parent-defined versions
Merge branch 'development' of https://github.com/societies/SOCIETIES-Platform into development