mark

mark
Merge branch 'mark'

Conflicts:
	app/controllers/admin/columns_controller.rb
	app/controllers/admin/customers_controller.rb
	app/helpers/admin_helper.rb
	app/models/logo.rb
	app/models/user.rb
	app/views/admin/columns/_form.html.erb
	app/views/admin/customers/edit.html.erb
	app/views/layouts/admin.html.erb
	app/views/logos/index.html.erb
	app/views/my_registrations/edit.html.erb
	config/routes.rb