A 300-berth marina and community boatyard close to the centre of Edinburgh has been approved after an initial rejection earlier in 2015