Merge branch 'hotfix/0.3'
Merge branch 'release/1.0'
no message
Merge branch 'hotfix/1.2' into develop

Conflicts:
	Operation.py
	Scheduler.py