重构前台结构
Merge branch 'master' of https://github.com/HuberyDu/bancheng

Conflicts:
	app/controllers/site_controller.rb
添加了 faq页面