fixed keycharm issue
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	dist/vis.js