Incomplete conversion to better angular-ng and jquery design
Merge branch 'small-issues' into setting-ng

Conflicts:
	src/ext/settingsDialog.js
	src/ext/userSettings.js