Winner in Edinburgh waterfront regeneration contest revealed