Added bootstrap_form to all forms
Fixed Heroku
Made Gemfile and Gemfile.lock consistent
Removed price from line_item
Merge branch 'master' of https://github.com/grow-love/ocs

Conflicts:
	app/helpers/orders_helper.rb
	app/views/orders/show.html.erb

Fixed diff between HEAD and local