reg js bug
Merge branch 'master' of github.com:sufish/wheat-web