Manually set the device information.
Fixed malformed secret
added ,
Merge remote-tracking branch 'origin/manual'

Conflicts:
	www/js/ClientServerCommunication.js