replaced quotes by single quotes, escaped single quotes where needed, preserved quotes where needed.
replaced quotes by single quotes, escaped single quotes where needed, preserved quotes where needed.
Merge branch 'b-dev-ce' of git://github.com/kermie/oxideshop_ce into kermie-b-dev-ce