.
Merge branch 'master' of https://github.com/drvgs-inc/KSimple

Conflicts:
	gui/Scripts/js/events.js