Minor tweek of admin js
Merge remote-tracking branch 'upstream/master'
fix rouge french chars on french site
Merge remote-tracking branch 'upstream/master' into pws
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
Fix isse with non-array plugin values
Merge remote-tracking branch 'upstream/master'
Merge pull request #277 from jerv13/master

Fix isse with non-array plugin values
Fix Firefox issue with call to action image
Merge remote-tracking branch 'upstream/master'
Merge pull request #278 from jerv13/master

Fix Firefox issue with call to action image
Updated for testing
Merge remote-tracking branch 'upstream/master'
Merge pull request #279 from jerv13/master

Refactor controller logic to service.
Added update display call for plugins on drop.
Merge remote-tracking branch 'upstream/master'
Merge pull request #280 from jerv13/master

Added update display call for plugins on drop.