20/8

20/8
Merge branch 'master' of https://github.com/zxz115/rail88

Conflicts:
	app/controllers/admin/columns_controller.rb
	app/controllers/admin/contents_controller.rb
	app/controllers/logos_controller.rb
	app/controllers/swipephotos_controller.rb
	app/controllers/template_controller.rb
	app/helpers/admin_helper.rb
	app/views/admin/columns/_form_edit.html.erb
	app/views/admin/columns/_form_edit_second.html.erb
	app/views/admin/columns/_form_new.html.erb
	app/views/admin/columns/_form_new_second.html.erb
	app/views/admin/customers/index.html.erb
	app/views/template/columnPage.html.erb
	app/views/template/contentPage.html.erb
	app/views/template/index.html.erb