Fixed issue with form dialog
Merge remote-tracking branch 'upstream/master'
Merge pull request #272 from jerv13/master

Fixed issue with form dialog
Merge pull request #271 from wshafer/master

Fix for admin panel on non CMS pages
recommended products plugin, functional test still needs to be added
Merge remote-tracking branch 'upstream/master' into pwsThemes
Merge pull request #273 from innaDa/pwsThemes

Pws themes
fix rouge french chars on french site
fix rouge french chars on french site
fix rouge french chars on french site
Merge remote-tracking branch 'upstream/master' into pws
fix tinymce relative urls
fix tinymce relative urls