模板提取
Merge branch 'master' of https://github.com/gokuai/yunku-setup

Conflicts:
	app/views/bootstrap/index.blade.php