display the default weight and length class
Merge branch 'master' of https://github.com/opencart/opencart

Conflicts:
	upload/admin/controller/localisation/length_class.php
	upload/admin/controller/localisation/weight_class.php