Signed-off-by: lizhizhou <lzz@meteroi.com>
Merge branch 'release' of https://github.com/ZhuanghuiZhu/Protein_C into release

Conflicts:
	Protein Crystallization/Form1.Designer.cs