Change Google fonts link to support both http and https.
Merge pull request #1337 from hellaslubo/upstream

Change Google fonts link to support both http and https.
fix for new type of exploit that affects all nearly all php sites that have file upload ability.
Merge branch 'master' of https://github.com/opencart/opencart
Merge pull request #1333 from eka7a/master

Moved Function Tool/Captcha
make sure the uploaded file exists
Fixed character strlen for name, meta_title and model.
Merge branch 'master' of git@github.com:opencart/opencart.git
Fix smtp email sending bug.
Fixed report for coupons to search the history table instead for start/end filters
Merge pull request #1340 from hellaslubo/smtp-patch

Fix smtp email sending bug.
Updated the placeholder text in the Realex modules to be Subaccount instead of Merchant ID
Escape special chars in product name and model

As this is passed more or less directly to the HTML-Form in the view, having special chars in the product name could prevent correct data from being send
more work custom fields done
Unify button style in some admin payment pages.
Merge pull request #1350 from hellaslubo/patch-admin-btn-ui

Unify button style in some admin payment pages.
Merge pull request #1348 from bthorben/patch-1

Escape special chars in product name and model
Added clear message to Realex users that they need to supply IP address or store URL before going live.
more custom field work done
Merge branch 'master' of https://github.com/opencart/opencart