added global admin/application_controler
added cancan to gemspec
started integrating cancan
finished initial cancan integration
Merge branch 'feature/mp-cancan' into develop
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
temporary change
added default image for variants
fixed conflicts