Merge pull request #1009 from eka7a/master

Failed to load resource: the server responded with a status of 404
more activity log work done
updated the settings page config keys

also started to alter the system so reward points and affiliate commission can be automatically added.
updated the system to automatically approve affiliates also sends an email tot he store owner if set.
fix for

https://github.com/opencart/opencart/issues/997
added the auto commission for affiliates
fix for

https://github.com/opencart/opencart/issues/814
affiliate order correction
ssl code check updated
affiliate update
fix for

https://github.com/opencart/opencart/pull/909
more work done on adding flexislider back and also activities
activity system finished
Fix for admin/controller/localisation/tax_class.php
fixed an issue with country select using old code.
Update featured.php
Merge pull request #1010 from devtsit/patch-13

Fix tax_class.php and featured.php
just fixed a few issues with activity
Merge branch 'master' of https://github.com/opencart/opencart