show page conflit solved
Merge branch 'develop' of github.com:Plazr/plazr_store into develop