add my own utf-8 unicode functions
Merge branch 'master' of https://github.com/opencart/opencart

Conflicts:
	upload/system/helper/utf8.php