图片墙缓存
Merge branch 'master' of https://github.com/wjling/Venn.git

Conflicts:
	Catherine/res/layout/images_page.xml