Moved files around
Merge remote-tracking branch 'upstream/master' into sandbox
Merge remote-tracking branch 'upstream/master' into sandbox
Merge remote-tracking branch 'upstream/master' into sandbox
Merge remote-tracking branch 'upstream/master' into sandbox
Minor tweek of admin js
fix rouge french chars on french site
recommended products plugin, functional test still needs to be added
Merge remote-tracking branch 'upstream/master'
fix rouge french chars on french site
Merge remote-tracking branch 'upstream/master' into pws
Merge pull request #275 from innaDa/fixes

Fixes
recommended products plugin, functional test still needs to be added
recommended products plugin, functional test still needs to be added
recommended products plugin, functional test still needs to be added
Merge remote-tracking branch 'upstream/master' into fixes
recommended products plugin, functional test still needs to be added
Merge pull request #276 from innaDa/fixesOrderNowTextEdit

Fixes order now text edit
Merge remote-tracking branch 'upstream/master'
Merge pull request #274 from jerv13/master

Minor tweek of admin js