add jquery.masonry
Merge branch 'develop'