delete logo.jpg
wall.html增加排序
Revert "delete logo.jpg"

This reverts commit b324154a51f75138655a165e7817e65e0fc001ba.
delete logo.jpg
Revert "wall.html增加排序"

This reverts commit eb78871f0bb47c5dadd4975877806a19bc881048.
wall.html增加排序
merged from merlin-master