layout 更新
Merge branch 'master' of https://github.com/r2space/YUKARiWeb

Conflicts:
	views/content_layout.html