Update piggybak.js
Update piggybak.js
Update order.rb
Update line_item.rb
Update piggybak.rb
Merge branch 'rails4' of https://github.com/eyeofbuddha/piggybak into rails4

Conflicts:
	app/assets/javascripts/piggybak/piggybak.js