Merge branch 'develop' into develop_SAGA

Conflicts:
	VERSION
	autosubmit/autosubmit.py
	autosubmit/config/config_common.py
	autosubmit/job/job.py
	autosubmit/job/job_common.py
	autosubmit/job/job_list.py
	autosubmit/platforms/ecplatform.py
	autosubmit/platforms/hpcplatform.py
	autosubmit/platforms/localplatform.py
	autosubmit/platforms/lsfplatform.py
	autosubmit/platforms/pbsplatform.py
	autosubmit/platforms/psplatform.py
	autosubmit/platforms/sgeplatform.py
	autosubmit/platforms/slurmplatform.py
	setup.py