update.
Merge branch 'master' of https://github.com/firzencode/ScenarioEditor

Conflicts:
	src/ScenarioEditor.py