Merge branch 'refactoring' of /clients1/alireza/Projects/repos/../Gmml/Dev/gmml-refactoring into remote
Merge branch 'refactoring' of /clients1/alireza/Projects/repos/../Gmml/Dev/gmml-refactoring into remote
Merge branch 'remote' of /clients1/delaram/Projects/gems/gmml into remote

Conflicts:
	src/MolecularModeling/assembly.cc
exception handling for existing file, removing HIS residues from unrecognized residues
Histidine residues preprocessing in pdb has been modified
Exception handling for reading pdb file
Merge branch 'remote' of /clients1/delaram/Projects/gems/gmml into refactoring

Conflicts:
	src/FileSet/PdbFileSpace/pdbfile.cc
	src/Resolver/PdbPreprocessor/pdbpreprocessor.cc
Merge branch 'refactoring' of /clients1/alireza/Projects/repos/../Gmml/Dev/gmml-refactoring into remote
Merge branch 'remote' of /clients1/delaram/Projects/gems/gmml into remote

Conflicts:
	src/FileSet/PdbFileSpace/pdbfile.cc
	src/Resolver/PdbPreprocessor/pdbpreprocessor.cc
Error fix
Merge branch 'refactoring'
Error fix
Merge branch 'refactoring' of /clients1/alireza/Projects/repos/../Gmml/Dev/gmml-refactoring into remote

Conflicts:
	src/FileSet/PdbFileSpace/pdbfile.cc
Merge branch 'refactoring'
Error fix
Merge branch 'refactoring' of /clients1/alireza/Projects/repos/../Gmml/Dev/gmml-refactoring into remote
Merge branch 'refactoring'
Error fix HIS residues pdb preprocessing
Merge branch 'refactoring' of /clients1/alireza/Projects/repos/../Gmml/Dev/gmml-refactoring into remote
Merge branch 'refactoring'
exception handling for file existance