[REVIEW] RSpec Feature

See merge request !10

[REVIEW] Order Feature

See merge request !8

# Conflicts:
#	app/controllers/products_controller.rb
#	app/services/solr.rb

[REVIEW] Fix Solr search

See merge request !7

# Conflicts:
#	app/controllers/carts_controller.rb
#	app/controllers/orders_controller.rb
#	app/controllers/product_items_controller.rb
#	app/helpers/carts_helper.rb
#	app/models/order.rb
#	app/services/cart.rb
#	app/views/carts/_product_item.html.erb
#	db/schema.rb

[Review] Solr feature

See merge request !5

# Conflicts:
#	Gemfile
#	app/controllers/product_items_controller.rb
#	app/helpers/carts_helper.rb
#	app/services/cart.rb

# Conflicts:
#	Gemfile
#	app/controllers/product_items_controller.rb
#	app/helpers/carts_helper.rb
#	app/services/cart.rb

# Conflicts:
#	Gemfile
#	app/controllers/product_items_controller.rb
#	app/helpers/carts_helper.rb
#	app/services/cart.rb

[Review] Stock feature

See merge request !4

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

[Review] Cart feature

See merge request !3

# Conflicts:
#	app/assets/javascripts/shop-14.js.erb
#	app/controllers/application_controller.rb
#	app/controllers/carts_controller.rb
#	app/helpers/carts_helper.rb
#	app/views/carts/_cart_table.html.erb
#	config/database.yml

# Conflicts:
#	Gemfile
#	Gemfile.lock
#	app/controllers/application_controller.rb
#	db/schema.rb

# Conflicts:
#	Gemfile
#	Gemfile.lock
#	app/controllers/application_controller.rb
#	db/schema.rb

[REVIEW] User management

See merge request !2