debug device version
Merge branch 'master' of https://github.com/satanas78/sample

Conflicts:
	www/js/index.js