Fix doll players

By making new players keep the type of their parent. Also added a
ghetto sqlite merger.