added global admin/application_controler
added cancan to gemspec
started integrating cancan
finished initial cancan integration
Merge branch 'feature/mp-cancan' into develop
removed duplicated migrations; WARNING: we need to take care with this
corrected small bug with variant_spec
old useless change
Merge branch 'develop' of github.com:Plazr/plazr_store into develop
Merge branch 'develop' of github.com:Plazr/plazr_store into develop
Merge branch 'develop' of github.com:Plazr/plazr_store into develop
temporary change
crud pages for admin done; integration with redactor still not done
changed variant_categories to product_categories and did all the changes related; specs still missing
specs for the product_categories operations
Merge branch 'feature/cp-pages_administration' into develop
added default image for variants
fixed conflicts
temporarily removed cancan for rspec to pass
Merge branch 'feature/mp-orders' into develop

Conflicts:
	app/models/plazr_store/variant.rb
	app/views/layouts/application.html.erb
	app/views/plazr_store/shared/_nav.html.erb
	test/dummy/spec/factories/users_factory.rb

resolved conflicts