Merge pull request #16 from opencart-lite/dev

Dev
Pre Action & fix admin
Merge pull request #18 from opencart-lite/core

Core