首页及公司业务页面修改
11
Merge branch 'master' of https://github.com/qadirbf/strong

Conflicts:
	.idea/workspace.xml
	app/controllers/admin_base_controller.rb
	app/views/layouts/application.html.erb
	app/views/main/about_us.html.erb