dev
Merge branch 'master' of https://github.com/King-fly/test

Conflicts:
	web/js/demo4.js