Added Billing reseller : Lister Group (SCAP)
Merge branch 'master' of https://github.com/sarayutu/php

Conflicts:
	d2/domain/bedb/packages.dao.class.php