Class Avon Lipstick Modifications
Merge remote-tracking branch 'origin/master'

Conflicts:
	dpa/kernel/api/class.AvonLipstick.php
	www/ajax/gridMaker_check.php