changes
Merge branch 'mockup' of github.com:Plazr/plazr_store into mockup
merged