Merge src and dev, create new dev branch afterwards