more module work done
Merge branch 'master' of https://github.com/opencart/opencart

Conflicts:
	upload/admin/controller/feed/openbaypro.php