today first
ksg
fix conflict
home page rank
some translate
merged
Merge branch 'production' of http://github.com/tianxind/cpwiki into production