adjust masonry
ceshi
Merge branch 'devs' into solve
solve bugs