Merge pull request #1 from opencart/master

Update code with OC updates
Merge pull request #2 from opencart/master

Merge OC current changes
Update seo_url.php
Merge pull request #2004 from opencart-russia/master

Update seo_url.php fix for another route
Update opencart.sql
Update seo_url.php
Merge pull request #3 from opencart/master

Update to latest
Fix for url alias keywords invalid when empty
BUG FIX on affiliate_list.tpl

BUG Found on On admin > Marketing > Affiliates
On the list you can't delete an affiliate due a missing action on the form
This fix de bug.
Update opencart.sql

Added the 2 regions missing in Chile according to current law (from year 1976), this fix the shipping and profile address for the people that live in that regions.
Also fixed the incomplete name of Ohiggins region
References:
http://en.wikipedia.org/wiki/ISO_3166-2:CL
http://en.wikipedia.org/wiki/Regions_of_Chile
Merge pull request #2013 from JAY6390/master

Fix for URL alias empty string
Merge pull request #2014 from CoverUp/patch-1

BUG FIX on affiliate_list.tpl
Merge pull request #2009 from opencart-russia/master

add url_alias and redirect 301
Merge pull request #2016 from CoverUp/patch-2

Update opencart.sql
adding a login system that will block to many wrong attempts.
Update product.tpl

Added check for guest reviews.  Display login prompt if guest review is disabled.
Update changelog.md
Update order.php

Added custom fields code to controller in order to be shown on order_info.tpl
Update order_info.tpl

Added custom fields to the followings section on sale/order/info 
Order Details => Account Custom Fields
Payment Details => Address Custom Fields (Asociated to payment address)
Shipping Details => Address Custom Fields (Associated to shipping address)
Update order_info.tpl

reeplaced some tab errors by spaces acording to code rules