Merge branch 'hotfix/1.0b1.4.1.2'
Merge branch 'release/1.0'
updated version number
Added DOI number to code
Merge branch 'hotfix/1.0.1' into develop

Conflicts:
	oecpy/__init__.py