add the result_state to models
Merge branch 'production' of https://github.com/chemistryTools/ChemToolsWebService into production

Conflicts:
	calcore/models.py
add result state and solve conflict