Change rating due to the database change0.0
Merge pull request #47 from DustInMonteriggioni/Branch-chyb

Change rating due to the database change0.0
Add COMBINED into BbkType.Sketch.Protein
Merge pull request #48 from DustInMonteriggioni/Branch-chyb

Add COMBINED into BbkType.Sketch.Protein
In the process of ctrlZ(), save changes
Try to solve conflict