Merge branch 'master' of github.com:shipengfei/xxx into feature/faye
add faye client js
remove faye gem
add test page
merge branch develop
delete faye js