commit for merge
Merge branch 'master' of https://github.com/FlanFlanagan/Bright-lite

Conflicts:
	Bright-lite/blmod.cc
updates for DUPIC