Merge with opencart 1.5.5.1

- Merge catalog/controller/account
- Replace string language loading