test paypal
Merge remote-tracking branch 'origin/master' into feature
paypal mini browser
paypal mini browser
test
test
test
fix on taxonomies
fix
logo images and js in show product
Merge branch 'master' of https://github.com/songecko/bopr
Merge branch 'master' into feature

Conflicts:
	src/Tresepic/BoprBundle/Resources/public/css/main.css
Merge remote-tracking branch 'origin/master' into feature
order history
Paypal mini browser
fix
add message
fix
changes
Merge branch 'feature'

Conflicts:
	src/Sylius/Bundle/WebBundle/Resources/translations/messages.es.yml