# Conflicts:
#	app/controllers/users_controller.rb
#	app/helpers/application_helper.rb
#	app/views/layouts/_header.html.erb
#	app/views/line_items/create.js.erb