Fixes issue on sub menu
Merge branch 'dev' into beta

Conflicts:
	CTRLW.user.js