Mostly merged in the Marks code in.  Still might be a efew things left to do.
Externalized string constants, setter fixes in User bean