Add waterfall layout and take picture when first show
Add wireframe
Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	README.md
	public/stylesheets/show.css
Add wireframe
Add wireframe
Merge pull request #7 from liuwei/master

你到show页面，点击右边wireframe这个多选框，可以看到效果,

merge from wayne