new mssgg
Merge branch 'master' of https://github.com/FlanFlanagan/Bright-lite

Conflicts:
	Bright-lite/Bright-lite.layout
	Bright-lite/burnupcalc.cpp
	Bright-lite/origenBuilder.cpp