LK & SW - begin implementation of updating settings
Merge branch 'master' of https://github.com/TWEFF/OpenWireless into auth

Conflicts:
	app/js/settings.js