merge from github
commit again OK1
Merge branch 'master' of https://github.com/mingderwang/App5.1

Conflicts:
	App5/App5.jsproj
	App5/default.html
	App5/js/default.js