test4
ttest4
Merge remote-tracking branch 'origin/master'

Conflicts:
	scriptpad/src/resources/scriptpad.js
comment reject