Merge branch 'hotfix/gemspec'
Calculating cart total price
Calculating cart total price
last changes
getting address from paypal
payment with paypal working but need some fixes
paypal payment wroking
payment cycle working
payment working but need tests
paypal some bug fixing
paypal feature working
Merge remote-tracking branch 'origin/rs-cart-payments' into feature/mp-orders

Conflicts:
	Gemfile
	app/controllers/plazr_store/cart_controller.rb
	app/controllers/plazr_store/orders_controller.rb
	config/routes.rb

resolved conflicts;
testing;
added unregistered role by default to ability
Merge branch 'develop', remote-tracking branch 'origin' into feature/cp-promotion
DiscountTypes CRUD removed; images created on product with populate; DiscountType are created by default in seed
added relation between feedback_product and order
resolved conflicts
last commit
final
resolved conflicts