change db server to localhost
merge
Refactor fucking stupid assholes NameMapper
Merge kkk...
mov intent detection modification
merge
master page
update
update admin
refactor code
chanels and programs name
Merge branch 'develop' into 'master'

Develop
update css
add disqus
Merge branch 'develop'
Merge branch 'develop' of 10.3.9.238:qa/rubyweb into develop
Merge branch 'master' of 10.3.9.238:qa/rubyweb
Updates defs.sutime.txt
Updates vn.sutime.txt
Merge branch 'develop' into 'master'

Develop