Fix issue 316

Fix issue https://github.com/open-classifieds/open-eshop/issues/316
Fix issue 318

Fix for issue https://github.com/open-classifieds/open-eshop/issues/318
Merge pull request #317 from emanwebdev/patch-8

Fix issue 316
Merge pull request #319 from emanwebdev/patch-9

Fix issue 318
Merge remote-tracking branch 'upstream/master'