bundle update jbuilder
Merge branch 'master' of github.com:Kejian-TV/Kejian-TV