Fixes a lot of code mistakes
Merge branch 'dev' into beta

Conflicts:
	CTRLW.user.js