Merge branch 'clients'

Conflicts:
	www/index.html
	www/js/storage.js