update controller
Merge branch 'master' of https://github.com/narakai/depot

Conflicts:
	app/controllers/line_items_controller.rb
Mergerd on 15DEC