add web file other
fixed js
fixed js
add new demo17.js
fixed merge Merge branch 'master' of https://github.com/King-fly/test

Conflicts:
	web/demo17.html