Dev lucidhack metal

inadvertently split commits between dev and dev-lucidhack-metal merging dev-lucidhack-metal to dev, and then will merge dev back to dev-lucidhack-metal

need to find way to set default branch on a per user bases...