Settings updated for new API version
Merge branch 'master' of https://github.com/ddsc/webclient

Conflicts:
	app/settings.js