update
update
Merge branch 'gh-pages' of github.com:oxox/demos into gh-pages
update
Merge branch 'gh-pages' of github.com:oxox/demos into gh-pages
update
Merge branch 'gh-pages' of github.com:oxox/demos into gh-pages
undate
update
update
update
update
update
update
Merge branch 'gh-pages' of github.com:oxox/demos into gh-pages

Conflicts:
	xh5/js/detail.picView.js
update
update