Fixes a little bug
Merge branch 'dev' into beta

Conflicts:
	CTRLW.user.js